Merge "Check submitter record in submit acceptance tests"
diff --git a/Documentation/user-search.txt b/Documentation/user-search.txt
index cd79812..0c6abb8 100644
--- a/Documentation/user-search.txt
+++ b/Documentation/user-search.txt
@@ -378,20 +378,20 @@
+
Matches changes with either a +1, +2, or any higher score.
-`label:CodeReview=+2,aname`::
+`label:Code-Review=+2,aname`::
+
Matches changes with a +2 code review where the reviewer or group is aname.
-`label:CodeReview=2,user=jsmith`::
+`label:Code-Review=2,user=jsmith`::
+
Matches changes with a +2 code review where the reviewer is jsmith.
-`label:CodeReview=+1,group=ldap/linux.workflow`::
+`label:Code-Review=+1,group=ldap/linux.workflow`::
+
Matches changes with a +1 code review where the reviewer is in the
ldap/linux.workflow group.
-`label:CodeReview<=-1`::
+`label:Code-Review<=-1`::
+
Matches changes with either a -1, -2, or any lower score.
diff --git a/ReleaseNotes/ReleaseNotes-2.8.1.txt b/ReleaseNotes/ReleaseNotes-2.8.1.txt
index 13762e31..b155f80 100644
--- a/ReleaseNotes/ReleaseNotes-2.8.1.txt
+++ b/ReleaseNotes/ReleaseNotes-2.8.1.txt
@@ -12,8 +12,12 @@
+
After rebasing the first change the other changes disappeared from the related changes list.
-* Fix plugin API packaging. Parts from JGit signed library were included in the
-plugin API. As a consequence unit tests were failing to execute against it.
+* Don't list the same change twice in related changes.
+
+* Fix plugin API packaging.
++
+Parts from JGit's signed library were included in the plugin API. As a consequence unit
+tests were failing to execute against it.
* Fix IllegalArgumentException in task queue comparator.
+
@@ -28,4 +32,16 @@
+
This happened if a new patch set was given for an initial commit in a repository.
-* Enable syntax highlighting for CXX, HXX, Python, Go, BUCK and .gitmodules.
+* link:https://code.google.com/p/gerrit/issues/detail?id=2320[Issue 2320],
+link:https://code.google.com/p/gerrit/issues/detail?id=2360[Issue 2360]:
+Enable syntax highlighting for CXX, HXX, Python, Go, Scala, BUCK and .gitmodules.
+
+* Preserve SNAPSHOT suffix in Maven artifact names.
++
+The SNAPSHOT suffix was being removed, which prevented Buck from
+downloading the Gitblit plugin's custom artifacts from the Gerritforge
+repository.
+
+* Always show repo download command if repo download scheme is enabled.
+
+* Minor fixes in the documentation.
diff --git a/VERSION b/VERSION
index 6a132bb..f0594c4 100644
--- a/VERSION
+++ b/VERSION
@@ -3,3 +3,4 @@
# when talking to the destination repository.
#
GERRIT_VERSION = '2.9-SNAPSHOT'
+
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/GetGroupIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/GetGroupIT.java
index 6a6c437..2a44531 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/GetGroupIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/GetGroupIT.java
@@ -24,7 +24,6 @@
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.server.account.GroupCache;
import com.google.gerrit.server.group.GroupJson.GroupInfo;
-import com.google.gson.reflect.TypeToken;
import com.google.inject.Inject;
import org.junit.Before;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeIndexer.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeIndexer.java
index b500e8a..437f559 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeIndexer.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeIndexer.java
@@ -244,7 +244,7 @@
}
}
} catch (Exception e) {
- log.error(String.format("Failed to index change %d", id), e);
+ log.error(String.format("Failed to index change %d", id.get()), e);
throw e;
}
}
