| commit | f5016f461b2e827a67616d9fdf24bbdf9194040e | [log] [tgz] |
|---|---|---|
| author | Shawn Pearce <sop@google.com> | Tue Nov 05 11:15:47 2013 -0800 |
| committer | Shawn Pearce <sop@google.com> | Tue Nov 05 11:15:47 2013 -0800 |
| tree | 5e1224cf2426f920f72e083adfb8a419897a5727 | |
| parent | 5a04d119085e0df41d8aeb2669a0359c84130dd0 [diff] | |
| parent | 5d1ce02e9d96241ef5364024e87f5964109aac27 [diff] |
Merge branch 'stable-2.7' into stable-2.8 * stable-2.7: Bump JSch to 1.5.0 to fix Java7 compatibility Extend AddBranchResult with toString method implementation Get rid of JdbcSQLException while numbers are read from cache Conflicts: gerrit-common/src/main/java/com/google/gerrit/common/data/AddBranchResult.java pom.xml Change-Id: Ic3bae80a40bfa2d8e8eee598bcdbd771b99cbeda