Merge branch 'stable-2.7'

* stable-2.7:
  Say in gsql documentation that 'Access Database' capability is required
  TrivialRebase: Replace category_id with label
  TrivialRebase: Avoid re-adding -2 for code-review label
  TrivialRebase: Support custom labels
  Fix test skipping flag
  Release notes for Gerrit 2.6.2
  Fix NullPointerException when comparing AccessSections

Conflicts:
	ReleaseNotes/index.txt
	tools/release.sh

Change-Id: I3babf1752a7c822fc1c3599643308959bb1da7ec

Documentation/cmd-gsql.txt

@@ -32,7 +32,9 @@ OPTIONS
 
 ACCESS
 ------
-Caller must be a member of the privileged 'Administrators' group.
+Caller must have been granted the
+link:access-control.html#capability_accessDatabase[Access Database]
+global capability.
 
 SCRIPTING
 ---------

ReleaseNotes/ReleaseNotes-2.6.2.txt

@@ -0,0 +1,43 @@
+Release notes for Gerrit 2.6.2
+==============================
+
+Gerrit 2.6.2 is now available:
+
+link:https://gerrit-releases.storage.googleapis.com/gerrit-2.6.2.war[
+https://gerrit-releases.storage.googleapis.com/gerrit-2.6.2.war]
+
+There are no schema changes from 2.6.1.
+
+However, if upgrading from a version older than 2.6, follow the upgrade
+procedure in the 2.6 link:ReleaseNotes-2.6.html[Release Notes].
+
+
+Bug Fixes
+---------
+
+
+* Fix null-pointer exception when dashboard title is not specified.
++
+If the title is not specified, the path of the dashboard config file
+is used as title.
+
+* link:https://code.google.com/p/gerrit/issues/detail?id=2010[Issue 2010]:
+Fix null-pointer exception when searching for changes with the query
+`owner:self`.
+
+* Properly handle double-click on external group in GroupTable.
++
+Double-clicking on an external group opens the group's URL (if it
+is provided).
+
+* link:https://code.google.com/p/gerrit/issues/detail?id=1872[Issue 1872]:
+Fix tab expansion in diff screens when syntax coloring is on.
+
+* link:https://code.google.com/p/gerrit/issues/detail?id=1904[Issue 1904]:
+Fix diff screens for files with CRLF line endings.
+
+* Allow label values to be configured with no text.
+
+
+No other changes since 2.6.1.
+

ReleaseNotes/index.txt

@@ -14,6 +14,7 @@ Version 2.7.x
 [[2_6]]
 Version 2.6.x
 -------------
+* link:ReleaseNotes-2.6.2.html[2.6.2]
 * link:ReleaseNotes-2.6.1.html[2.6.1]
 * link:ReleaseNotes-2.6.html[2.6]
 

contrib/trivial_rebase.py

@@ -133,7 +133,7 @@ class TrivialRebase:
     Returns a list of approval dicts.
 
     """
-    sql_query = ("\"SELECT value,account_id,category_id FROM patch_set_approvals "
+    sql_query = ("\"SELECT value,account_id,category_id AS label FROM patch_set_approvals "
                  "WHERE change_id = %s AND patch_set_id = %s AND value != 0\""
                  % (self.changeId, (self.patchset - 1)))
     gsql_out = self.GsqlQuery(sql_query)
@@ -223,19 +223,20 @@ class TrivialRebase:
       # Note: Sites with different 'copy_min_score' values in the
       # approval_categories DB table might want different behavior here.
       # Additional categories should also be added if desired.
-      if approval["category_id"] == "Code-Review" and approval['value'] != '-2':
+      if approval["label"] == "Code-Review":
-        self.AppendAcctApproval(approval['account_id'], '--code-review %s' % approval['value'])
+        if approval['value'] != '-2':
-      elif approval["category_id"] == "Verified":
+          self.AppendAcctApproval(approval['account_id'],
+                                  '--label Code-Review=%s' % approval['value'])
+      elif approval["label"] == "Verified":
         # Don't re-add verifies
-        # self.AppendAcctApproval(approval['account_id'], '--verified %s' % approval['value'])
+        # self.AppendAcctApproval(approval['account_id'], '--label Verified=%s' % approval['value'])
         continue
-      elif approval["category_id"] == "SUBM":
+      elif approval["label"] == "SUBM":
         # We don't care about previous submit attempts
         continue
       else:
-        self.AppendAcctApproval(approval['account_id'], '--%s %s' %
+        self.AppendAcctApproval(approval['account_id'], '--label %s=%s' %
-                                (approval['category_id'].lower().replace(' ', '-'),
+                                (approval['label'], approval['value']))
-                                 approval['value']))
 
     gerrit_review_msg = ("\'Automatically re-added by Gerrit trivial rebase "
                           "detection script.\'")