| commit | d323db9450b75243124232f6b9d7cf07b1653e8f | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <david.pursehouse@sonymobile.com> | Fri Feb 27 18:41:58 2015 +0900 |
| committer | David Pursehouse <david.pursehouse@sonymobile.com> | Fri Feb 27 18:41:58 2015 +0900 |
| tree | 65914366b29b15163c261cd7a2ec29bda59712b5 | |
| parent | a4dd362c3806990c7e9957e36866db6fe4cdfdf0 [diff] | |
| parent | 6be187457cfa02cbd706fb5dede4b7c01c30f9eb [diff] |
Merge branch 'stable-2.10' * stable-2.10: Upgrade guice multibindings to match version used by Gerrit. Handle the BadRequestException from ListProjects Conflicts: src/main/java/com/googlesource/gerrit/plugins/gitiles/GerritGitilesAccess.java Change-Id: If3638765a618fe2c9f8f9e201650d837656c16ec