tree 2a32ac3efc9757c6a55edd63f1da7e2b9699ed22
parent ccb099b3f2512ee64b50e67d8dc2f558c501567f
parent bd4e609c3d522d2f7f9efa78129de8f4163698c8
author Shawn Pearce <sop@google.com> 1367880324 -0700
committer Shawn Pearce <sop@google.com> 1367880324 -0700

Merge branch 'stable-2.6'

* stable-2.6:
  Always run acceptance tests
  Update plugin versions during release
  Ensure core plugins are bundled by Maven
  Revert "Run Documentation formatting in parallel"
  Always run acceptance tests when creating a release build
  Run Documentation formatting in parallel
  Always build all components of Gerrit
  Always include documention in the build

Conflicts:
	gerrit-gwtexpui/.gitignore
	pom.xml

Change-Id: I4834f9da6be51cf4dc26634caad0e08470e8cc42