| commit | d363fa34cd0cddb9d2bdd1747a093d9917ce16d4 | [log] [tgz] |
|---|---|---|
| author | Shawn Pearce <sop@google.com> | Wed Apr 23 21:23:51 2014 -0700 |
| committer | Shawn Pearce <sop@google.com> | Wed Apr 23 21:23:51 2014 -0700 |
| tree | 5f6f5dc0555991bc4064946185d055256409c360 | |
| parent | 1519979023407c3a521931b621649d1a01005f27 [diff] | |
| parent | 52c73b831dd60f4065ffdd3dee80facb80bdbe05 [diff] |
Merge branch 'stable-2.8' into stable-2.9 * stable-2.8: SideBySide2: Fix failure to load from "ISE EditIterator out of bounds" Remove "Click to" from topic edit button's tooltip Fix: wrongly throw 'commit already exists' exception Update sshd to 0.11.0 Bump SSHD version to 0.10.1 and enable nio2 backend Conflicts: gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Topic.ui.xml Change-Id: I63c1e12bbd413a8e212de5b2a8cf71fa2a2ce52d