commit | 133d0a22f4116ebf11c283fd0a9c3bbdcd9e8d8a | [log] [tgz] |
---|---|---|
author | David Pursehouse <david.pursehouse@sonymobile.com> | Tue Mar 03 10:12:52 2015 +0900 |
committer | David Pursehouse <david.pursehouse@sonymobile.com> | Tue Mar 03 10:12:52 2015 +0900 |
tree | 2fe2d223cb5544c4672b2820d43b04b26490d36c | |
parent | 944edea8cb358e1863f4d84f0b372f3337eb0b3b [diff] | |
parent | 5ac8e3475cc284bd1c2159cfded076c959462845 [diff] |
Merge branch 'stable-2.10' into stable-2.11 * stable-2.10: Maven: use same version number for plugin version and API version Maven: Add missing junit dependency Consume API version 2.10 Consume API version 2.9 Conflicts: lib/gerrit/BUCK pom.xml Change-Id: If133617f4e8a46821790d0e6ce3d2c576979654e