gerrit/gerrit-acceptance-tests
Shawn Pearce 56fa6ba507 Merge branch 'stable-2.8'
* stable-2.8:
  Fix Merge Always and Merge If Necessary strategies
  Fix formatting problem in buck documentation
  Buck: Expand instructions related to setting up the path

Conflicts:
	Documentation/dev-buck.txt
	gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
	gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByMergeAlwaysIT.java
	gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java

Change-Id: I56fd7f427d9d4bd5c1ec5c37ab5e744065cfd3b9
2014-03-14 00:15:27 -07:00
..
src/test/java/com/google/gerrit/acceptance Merge branch 'stable-2.8' 2014-03-14 00:15:27 -07:00
BUCK Run acceptance tests with different configs using @Parameterized 2014-01-30 16:11:36 -08:00
tests.defs Run acceptance tests with different configs using @Parameterized 2014-01-30 16:11:36 -08:00