RETIRED, Gerrit as used by OpenStack
Go to file
Shawn O. Pearce 6738e5f340 Merge branch 'stable-2.5'
* stable-2.5:
  NPE when strategy is cherry-pick and changeMerge.test enabled
  Fix owner column to link to same status
  Sort groups on the group list screen
  Documentation: Add link to test-submit-rule from the prolog cookbook.
  Do not log RepositoryNotFoundException if non-existing project is accessed
  Documentation: Add submit rule example on how to implement 1+1=2
  Fix OutOfScope exception when auditing ssh auth failure.
  Fix a NPE caused by GerritCall.getMethod returning null.
  Add org.apache.mina as dependency to pom.xml

Conflicts:
	gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java

Change-Id: Id280ca6afebbe299e5841ddf8850184714f70de7
2012-10-25 13:29:29 -07:00
contrib Add an exponentially rolling garbage collection script 2012-06-14 18:24:17 -06:00
Documentation Merge branch 'stable-2.5' 2012-10-25 13:29:29 -07:00
gerrit-antlr Update versions in pom's to start Gerrit 2.6 development 2012-08-22 14:09:52 +02:00
gerrit-cache-h2 Fix various warnings 2012-10-18 13:38:51 +02:00
gerrit-common Merge branch 'stable-2.5' 2012-10-25 13:29:29 -07:00
gerrit-extension-api Allow web UI plugins to auto-register 2012-10-21 17:54:33 -07:00
gerrit-gwtdebug Fix warnings caused by wrong BouncyCastle version in pom files 2012-10-21 20:14:37 -07:00
gerrit-gwtui Merge branch 'stable-2.5' 2012-10-25 13:29:29 -07:00
gerrit-httpd Merge branch 'stable-2.5' 2012-10-25 13:29:29 -07:00
gerrit-launcher Remove servlet-api from WAR/lib 2012-10-21 21:25:25 -07:00
gerrit-main Update versions in pom's to start Gerrit 2.6 development 2012-08-22 14:09:52 +02:00
gerrit-openid Update versions in pom's to start Gerrit 2.6 development 2012-08-22 14:09:52 +02:00
gerrit-package-plugins Merge branch 'stable-2.5' 2012-10-23 12:54:18 +02:00
gerrit-patch-commonsnet Update versions in pom's to start Gerrit 2.6 development 2012-08-22 14:09:52 +02:00
gerrit-patch-jgit Update versions in pom's to start Gerrit 2.6 development 2012-08-22 14:09:52 +02:00
gerrit-pgm Merge "Upgrade embedded Jetty to 8.1.7.v20120910" 2012-10-24 16:36:32 -07:00
gerrit-plugin-api Allow plugins to contribute InitStep to Gerrit init. 2012-10-22 10:07:31 -07:00
gerrit-plugin-archetype Update versions in pom's to start Gerrit 2.6 development 2012-08-22 14:09:52 +02:00
gerrit-plugin-gwt-archetype GWT plugin archetype 2012-10-22 10:48:43 +02:00
gerrit-plugin-gwtui JavaScipt and GWT based UI plugin support 2012-10-21 16:50:03 -07:00
gerrit-plugin-js-archetype JavaScript plugin archetype 2012-10-22 10:48:37 +02:00
gerrit-prettify Update versions in pom's to start Gerrit 2.6 development 2012-08-22 14:09:52 +02:00
gerrit-reviewdb Permit booleans in project.config to be inherited 2012-10-25 11:20:47 -07:00
gerrit-server Merge branch 'stable-2.5' 2012-10-25 13:29:29 -07:00
gerrit-sshd Merge branch 'stable-2.5' 2012-10-25 13:29:29 -07:00
gerrit-util-cli Update versions in pom's to start Gerrit 2.6 development 2012-08-22 14:09:52 +02:00
gerrit-util-ssl Update versions in pom's to start Gerrit 2.6 development 2012-08-22 14:09:52 +02:00
gerrit-war Merge "Remove servlet-api from WAR/lib" 2012-10-24 16:36:51 -07:00
ReleaseNotes Merge branch 'stable-2.5' 2012-10-23 12:54:18 +02:00
tools Exclude pom in archetype resources from version replacement 2012-07-31 15:22:58 +02:00
.gitignore Add Intellij IDEA files to ignore list 2012-05-03 13:17:43 -07:00
COPYING Initial project setup of Gerrit 2 2008-11-14 16:59:34 -08:00
INSTALL Remove Gerrit 1.x to 2.x import tools 2009-03-27 20:20:10 -07:00
pom.xml Merge branch 'stable-2.5' 2012-10-25 13:29:29 -07:00
SUBMITTING_PATCHES Update push URL in SUBMITTING_PATCHES 2012-03-29 00:57:14 -04:00