Merge branch 'stable-2.8'

* stable-2.8:
  Release notes for Gerrit 2.8.3
  Add clarification about commitWithin setting and reindex
  Update cookbook plugin revision
  Bump version to 2.8.3 in plugin API and archetypes
  Bump GERRIT_VERSION to 2.8.3

Conflicts:
	VERSION
	gerrit-plugin-archetype/pom.xml
	gerrit-plugin-gwt-archetype/pom.xml
	gerrit-plugin-gwtui/pom.xml
	gerrit-plugin-js-archetype/pom.xml

Change-Id: I29b59c9b2fe0967042bc67a7048d0b8374c54793

Documentation/config-gerrit.txt

@@ -1944,6 +1944,12 @@ If zero or negative, changes are committed after every write. This is
 very costly but may be useful if offline reindexing is infeasible, or
 for development servers.
 +
+This setting also applies when running the reindex program.  If it is
+configured to commit on every write, this will cause reindex to take
+an unnecessarily long time to complete on sites that have a lot of
+changes.  It is recommended to temporarily set a higher value while
+running reindex.
+
 Defaults to 300000 ms (5 minutes).
 
 Sample index configuration:

ReleaseNotes/ReleaseNotes-2.8.3.txt

@@ -0,0 +1,35 @@
+Release notes for Gerrit 2.8.3
+==============================
+
+There are no schema changes from link:ReleaseNotes-2.8.2.html[2.8.2].
+
+Download:
+link:https://gerrit-releases.storage.googleapis.com/gerrit-2.8.3.war[
+https://gerrit-releases.storage.googleapis.com/gerrit-2.8.3.war]
+
+
+Bug Fixes
+---------
+
+* Fix for merging multiple changes with "Cherry Pick", "Merge Always" and
+"Merge If Necessary" strategies.
++
+If 2 or more changes were pending submit to the same project and branch,
+it was possible for them to all be marked as status "merged" but only some of
+them to actually land into the branch.
+
+
+Documentation
+-------------
+
+* Minor fixes in the
+link:https://gerrit-documentation.storage.googleapis.com/Documentation/2.8.3/dev-buck.html[
+buck build documentation].
+
+* Clarification of the `commitWithin` setting in the
+link:https://gerrit-documentation.storage.googleapis.com/Documentation/2.8.3/config-gerrit.html#__a_id_index_a_section_index[
+Lucene index configuration].
++
+Configuring the Lucene index to commit after every write can cause
+poor performance of the reindex program.
+

ReleaseNotes/index.txt

@@ -9,6 +9,7 @@ Version 2.9.x
 [[2_8]]
 Version 2.8.x
 -------------
+* link:ReleaseNotes-2.8.3.html[2.8.3]
 * link:ReleaseNotes-2.8.2.html[2.8.2]
 * link:ReleaseNotes-2.8.1.html[2.8.1]
 * link:ReleaseNotes-2.8.html[2.8]