Merge branch 'stable-2.9'

* stable-2.9:
  Release notes for Gerrit 2.8.6.1
  Remove reference to MyISAM from database setup documentation
  Update version to 2.8.6.1
  Upgrade gwtorm to 1.7.3
  Fix reference to Forge Committer access right in documentation
  Avoid avatar URL requests on load of change list
  Update 2.8.6 release notes with recent fixes
  Update SSHD to 0.11.1-atlassian-1
  Expose Atlassian's maven repository
  Update gwtorm to 1.7.1
  Buck: Strip SNAPSHOT suffix in artifact names only for GERRIT repositories

Conflicts:
	VERSION
	lib/maven.defs

Change-Id: Iacf4e3634cf4dbd2a1b86558f06cf5cdb0e50475

Documentation/database-setup.txt

@@ -56,14 +56,6 @@ rights on it:
   FLUSH PRIVILEGES;
 ----
 
-If you are using the MyISAM engine, you need to set latin1 as charset:
-
-----
-  mysql
-
-  ALTER DATABASE reviewdb charset=latin1;
-----
-
 Visit MySQL's link:http://dev.mysql.com/doc/[documentation] for further
 information regarding using MySQL.
 

Documentation/error-invalid-committer.txt

@@ -95,9 +95,9 @@ If pushing to Gerrit fails with the error message "invalid committer"
 and somebody else committed the change for which the
 push fails, then you have no permissions to forge the committer
 identity. In this case you may contact the project owner to request
-the access right '+2 Forge Committer or Tagger Identity' in the
-'Forge Identity' category or ask the maintainer to commit this change
-on the author's behalf.
+the link:access-control.html#category_forge_committer['Forge Committer']
+access right or ask the maintainer to commit this change on the author's
+behalf.
 
 
 GERRIT

ReleaseNotes/ReleaseNotes-2.8.6.1.txt

@@ -0,0 +1,23 @@
+Release notes for Gerrit 2.8.6.1
+================================
+
+There are no schema changes from link:ReleaseNotes-2.8.6.html[2.8.6].
+
+Download:
+link:https://gerrit-releases.storage.googleapis.com/gerrit-2.8.6.1.war[
+https://gerrit-releases.storage.googleapis.com/gerrit-2.8.6.1.war]
+
+Bug Fixes
+---------
+
+* The fix in 2.8.6 for the merge queue race condition caused a regression
+in database transaction handling.
+
+* The fix in 2.8.6 for the LIMIT clause caused a regression in Oracle
+database support.
+
+
+Updates
+-------
+
+* gwtorm is updated to 1.7.3

ReleaseNotes/ReleaseNotes-2.8.6.txt

@@ -7,6 +7,8 @@ Download:
 link:https://gerrit-releases.storage.googleapis.com/gerrit-2.8.6.war[
 https://gerrit-releases.storage.googleapis.com/gerrit-2.8.6.war]
 
+*Warning*: Support for MySQL's MyISAM storage engine is discontinued.
+Only transactional storage engines are supported.
 
 Bug Fixes
 ---------
@@ -14,10 +16,32 @@ Bug Fixes
 * link:https://code.google.com/p/gerrit/issues/detail?id=2034[Issue 2034],
 link:https://code.google.com/p/gerrit/issues/detail?id=2383[Issue 2383],
 link:https://code.google.com/p/gerrit/issues/detail?id=2702[Issue 2702]:
-Fix race condition in change merge queue.
+Fix race condition in change merge queue when using Cherry-Pick submit
+strategy.
 +
 There was a race in the merge queue between changes submitted via
 the UI, and merges scheduled by the background merge queue reload.
 +
 This resulted in multiple submit actions being scheduled, leading
 to corrupt changes.
++
+Execute cherry-pick submit DML operations in a database transaction
+boundaries. In combination with implemented transaction management
+for Jdbc dialects it solves the problem recovering from collisions
+between interactive actions and background jobs.
+
+* In gwtorm the LIMIT clause was only honored when followed by a
+constant integer.
++
+When followed by a placeholder "?" it wasn't included in the generated database
+query. This caused poor performance when moving to the next change page for very
+big projects.
+
+* Fix sporadic SSHD handshake failures
+(link:https://issues.apache.org/jira/browse/SSHD-330[SSHD-330]).
+
+Updates
+-------
+
+* gwtorm is updated to 1.7.1
+* sshd is updated to 0.11.1-atlassian-1

ReleaseNotes/index.txt

@@ -9,6 +9,7 @@ Version 2.9.x
 [[2_8]]
 Version 2.8.x
 -------------
+* link:ReleaseNotes-2.8.6.1.html[2.8.6.1]
 * link:ReleaseNotes-2.8.6.html[2.8.6]
 * link:ReleaseNotes-2.8.5.html[2.8.5]
 * link:ReleaseNotes-2.8.4.html[2.8.4]

gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css

@@ -96,6 +96,8 @@ a:hover {
   margin-right: 0.2em;
   position: relative;
   top: 2px;
+  height: 16px !important;
+  width: 16px;
 }
 
 .accountLinkPanel a {

gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountLinkPanel.java

@@ -61,7 +61,7 @@ public class AccountLinkPanel extends FlowPanel {
     };
     l.setTitle(FormatUtil.nameEmail(info));
 
-    add(new AvatarImage(info, 16));
+    add(new AvatarImage(info));
     add(l);
   }
 

lib/maven.defs

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+ATLASSIAN = 'ATLASSIAN:'
 GERRIT = 'GERRIT:'
 GERRIT_API = 'GERRIT_API:'
 MAVEN_CENTRAL = 'MAVEN_CENTRAL:'

lib/mina/BUCK

@@ -8,11 +8,12 @@ EXCLUDE = [
 
 maven_jar(
   name = 'sshd',
-  id = 'org.apache.sshd:sshd-core:0.11.0',
-  sha1 = '450da44553c98805ca6bb5709cad54df4acb802a',
+  id = 'org.apache.sshd:sshd-core:0.11.1-atlassian-1',
+  sha1 = '0de20bfa03ddeedc8eb54ab6e85e90e776ea18f8',
   license = 'Apache2.0',
   deps = [':core'],
   exclude = EXCLUDE,
+  repository = ATLASSIAN,
 )
 
 maven_jar(

tools/util.py

@@ -15,6 +15,7 @@
 from os import path
 
 REPO_ROOTS = {
+  'ATLASSIAN': 'https://maven.atlassian.com/content/repositories/atlassian-3rdparty',
   'GERRIT': 'http://gerrit-maven.storage.googleapis.com',
   'GERRIT_API': 'https://gerrit-api.commondatastorage.googleapis.com/release',
   'MAVEN_CENTRAL': 'http://repo1.maven.org/maven2',