RETIRED, Gerrit as used by OpenStack
Go to file
Dave Borowitz 9ef5abd5cf Merge branch 'stable-2.7'
* stable-2.7:
  Set version to 2.7
  Fix installation of plugins
  Fix change stuck in SUBMITTED state but actually merged
  Remove documentation links from admin page
  NPE when deleting draft patch set when previous draft already deleted
  Fix example for 'test-submit rule' in Prolog cookbook
  Mark ALREADY_MERGED changes as merged in the DB and run hooks

Conflicts:
	gerrit-acceptance-tests/pom.xml
	gerrit-antlr/pom.xml
	gerrit-cache-h2/pom.xml
	gerrit-common/pom.xml
	gerrit-extension-api/pom.xml
	gerrit-gwtdebug/pom.xml
	gerrit-gwtexpui/pom.xml
	gerrit-gwtui/pom.xml
	gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties
	gerrit-httpd/pom.xml
	gerrit-launcher/pom.xml
	gerrit-main/pom.xml
	gerrit-openid/pom.xml
	gerrit-patch-commonsnet/pom.xml
	gerrit-patch-jgit/pom.xml
	gerrit-pgm/pom.xml
	gerrit-plugin-api/pom.xml
	gerrit-plugin-archetype/pom.xml
	gerrit-plugin-gwt-archetype/pom.xml
	gerrit-plugin-gwtui/pom.xml
	gerrit-plugin-js-archetype/pom.xml
	gerrit-prettify/pom.xml
	gerrit-reviewdb/pom.xml
	gerrit-server/pom.xml
	gerrit-sshd/pom.xml
	gerrit-util-cli/pom.xml
	gerrit-util-ssl/pom.xml
	gerrit-war/pom.xml
	plugins/commit-message-length-validator
	plugins/replication
	plugins/reviewnotes
	pom.xml

Change-Id: Iacb961caf52032e7e445be9ed81376db849e171b
2013-09-18 13:13:29 -07:00
.settings Suppress Eclipse warning "annotation should not be used as a superinterface" 2013-05-10 10:31:19 -07:00
contrib Add bash completion script for gerrit.sh 2013-08-22 16:18:42 +09:00
Documentation Merge branch 'stable-2.7' 2013-09-18 13:13:29 -07:00
gerrit-acceptance-tests Set version to 2.7 2013-09-18 13:05:11 -07:00
gerrit-antlr Set version to 2.7 2013-09-18 13:05:11 -07:00
gerrit-cache-h2 Set version to 2.7 2013-09-18 13:05:11 -07:00
gerrit-common Set version to 2.7 2013-09-18 13:05:11 -07:00
gerrit-extension-api Set version to 2.7 2013-09-18 13:05:11 -07:00
gerrit-gwtdebug Set version to 2.7 2013-09-18 13:05:11 -07:00
gerrit-gwtexpui Set version to 2.7 2013-09-18 13:05:11 -07:00
gerrit-gwtui Merge branch 'stable-2.7' 2013-09-18 13:13:29 -07:00
gerrit-httpd Set version to 2.7 2013-09-18 13:05:11 -07:00
gerrit-launcher Set version to 2.7 2013-09-18 13:05:11 -07:00
gerrit-lucene Lucene: disable default english stop words set 2013-09-13 22:55:51 +02:00
gerrit-main Set version to 2.7 2013-09-18 13:05:11 -07:00
gerrit-openid Set version to 2.7 2013-09-18 13:05:11 -07:00
gerrit-patch-commonsnet Set version to 2.7 2013-09-18 13:05:11 -07:00
gerrit-patch-jgit Set version to 2.7 2013-09-18 13:05:11 -07:00
gerrit-pgm Set version to 2.7 2013-09-18 13:05:11 -07:00
gerrit-plugin-api Set version to 2.7 2013-09-18 13:05:11 -07:00
gerrit-plugin-archetype Set version to 2.7 2013-09-18 13:05:11 -07:00
gerrit-plugin-gwt-archetype Set version to 2.7 2013-09-18 13:05:11 -07:00
gerrit-plugin-gwtui Set version to 2.7 2013-09-18 13:05:11 -07:00
gerrit-plugin-js-archetype Set version to 2.7 2013-09-18 13:05:11 -07:00
gerrit-prettify Set version to 2.7 2013-09-18 13:05:11 -07:00
gerrit-reviewdb Set version to 2.7 2013-09-18 13:05:11 -07:00
gerrit-server Merge branch 'stable-2.7' 2013-09-18 13:13:29 -07:00
gerrit-solr Push limit term into secondary index queries 2013-08-09 01:14:53 +00:00
gerrit-sshd Merge branch 'stable-2.7' 2013-09-18 13:13:29 -07:00
gerrit-util-cli Set version to 2.7 2013-09-18 13:05:11 -07:00
gerrit-util-ssl Set version to 2.7 2013-09-18 13:05:11 -07:00
gerrit-war Set version to 2.7 2013-09-18 13:05:11 -07:00
lib Add dependency on the Google protocol buffer library 2013-09-10 15:59:25 -07:00
plugins Merge branch 'stable-2.7' 2013-09-18 13:13:29 -07:00
ReleaseNotes Update the 2.6.2 release notes 2013-09-18 15:27:15 +09:00
tools Remove asciidoc.conf 2013-09-04 21:31:03 -07:00
website/releases Use new cached URL for Diffy logo on releases page 2013-09-09 15:18:08 -07:00
.buckconfig Let buck ignore the .git folder 2013-09-17 08:48:35 +02:00
.buckversion Update Buck 2013-08-15 17:25:45 +00:00
.gitignore Add org.eclipse.ltk.core.refactoring.prefs to .gitignore 2013-07-11 18:02:25 +09:00
.gitmodules Replace helloworld plugin with cookbook plugin 2013-08-13 11:41:58 +09:00
.pydevproject Set python version back to 2.6.5 in .pydevproject 2013-05-20 11:36:08 +09:00
BUCK Buck: add javax.http package to gerrit-plugin-api 2013-08-13 09:18:06 +02: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
SUBMITTING_PATCHES Update push URL in SUBMITTING_PATCHES 2012-03-29 00:57:14 -04:00
VERSION Cleanup maven_deploy, maven_install build rules 2013-07-29 14:05:26 -07:00