| commit | e4893eb0ff7fba34f9097335f6402fb7ff612e22 | [log] [tgz] |
|---|---|---|
| author | Shawn Pearce <sop@google.com> | Fri Nov 08 20:48:02 2013 -0800 |
| committer | Shawn Pearce <sop@google.com> | Fri Nov 08 20:56:49 2013 -0800 |
| tree | 578f65ce312f1545903d39699608ca0697135773 | |
| parent | a4b4ea27ed5a7399674624dba5c894293035b953 [diff] | |
| parent | e5b7f1aa5c195098cdd043a21aa2734dd0764db4 [diff] |
Merge branch 'stable-2.6' into stable-2.7 * stable-2.6: Bump SSHD version to 0.9.0.201311081 Conflicts: gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java Change-Id: Iacee71305c167687c8f70836bff802b1dfec2082