| commit | 84646adb82bd9c475a67e1781a4b92945fd61ab0 | [log] [tgz] |
|---|---|---|
| author | Shawn Pearce <sop@google.com> | Fri Nov 08 21:16:47 2013 -0800 |
| committer | Shawn Pearce <sop@google.com> | Fri Nov 08 21:16:47 2013 -0800 |
| tree | b1b6b0d57b4b1feda9bb2e9af8cb3e8627ce751e | |
| parent | f4a8de43a6fc8cc00c598bec9ce10b2ecbfded8f [diff] | |
| parent | e4893eb0ff7fba34f9097335f6402fb7ff612e22 [diff] |
Merge branch 'stable-2.7' into stable-2.8 * stable-2.7: Bump SSHD version to 0.9.0.201311081 Conflicts: gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowConnections.java pom.xml Change-Id: I29487ae1efb5bdf6f18fc76fe14790a530481c9f