Edwin Kempin 63c8165124 Reindex a change that during MergeOp is found to be already merged ...

If in MergeOp we find that a change to be merged is actually already
merged its status is simply set to MERGED. After updating the change
status the change should be reindexed.

Change-Id: Ib5bb4e1fc9b60e10640add32a859210e10189201
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>

2013-09-27 10:42:47 +09: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 "Fix a few coding style nits in Buck build Python scripts"

2013-09-26 23:39:24 +00:00

gerrit-acceptance-tests

Add our own Nullable implementation

2013-09-26 15:34:27 +00: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

Add our own Nullable implementation

2013-09-26 15:34:27 +00: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

Add our own Nullable implementation

2013-09-26 15:34:27 +00:00

gerrit-httpd

Add our own Nullable implementation

2013-09-26 15:34:27 +00:00

gerrit-launcher

Set version to 2.7

2013-09-18 13:05:11 -07:00

gerrit-lucene

Add our own Nullable implementation

2013-09-26 15:34:27 +00:00

gerrit-main

Set version to 2.7

2013-09-18 13:05:11 -07:00

gerrit-openid

Add our own Nullable implementation

2013-09-26 15:34:27 +00: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

Add our own Nullable implementation

2013-09-26 15:34:27 +00:00

gerrit-plugin-api

Set version to 2.7

2013-09-18 13:05:11 -07:00

gerrit-plugin-archetype

Adapt plugin archetypes to set plugin name in manifest

2013-09-26 05:49:52 +00:00

gerrit-plugin-gwt-archetype

Adapt plugin archetypes to set plugin name in manifest

2013-09-26 05:49:52 +00:00

gerrit-plugin-gwtui

Set version to 2.7

2013-09-18 13:05:11 -07:00

gerrit-plugin-js-archetype

Adapt plugin archetypes to set plugin name in manifest

2013-09-26 05:49:52 +00:00

gerrit-prettify

Set version to 2.7

2013-09-18 13:05:11 -07:00

gerrit-reviewdb

ChangeScreen2: add Gerrit config and user preference

2013-09-24 12:33:47 -07:00

gerrit-server

Reindex a change that during MergeOp is found to be already merged

2013-09-27 10:42:47 +09:00

gerrit-solr

Remove unnecessary @SuppressWarnings("deprecation") in SolrChangeIndex

2013-09-26 11:27:51 +09:00

gerrit-sshd

Add our own Nullable implementation

2013-09-26 15:34:27 +00:00

gerrit-util-cli

Add our own Nullable implementation

2013-09-26 15:34:27 +00: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

Revert "BUCK: fix Implementation-Version in replication plugin"

2013-09-21 02:49:23 +00:00

plugins

Update replication plugin to latest revision

2013-09-24 15:26:55 +09:00

ReleaseNotes

Remove 2.6.2 release notes from release notes index

2013-09-24 19:10:12 +09:00

tools

Fix a few coding style nits in Buck build Python scripts

2013-09-26 16:50:07 +09:00

website/releases

Use new cached URL for Diffy logo on releases page

2013-09-09 15:18:08 -07:00

.buckconfig

Update Buck to latest master

2013-09-20 19:41:26 -07:00

.buckversion

Update Buck

2013-09-26 16:33:09 -07: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

Update Buck to latest master

2013-09-20 19:41:26 -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

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

Description

RETIRED, Gerrit as used by OpenStack

120 MiB