Merge branch 'stable-2.6' into stable-2.7

* stable-2.6:
  Say in gsql documentation that 'Access Database' capability is required
  Release notes for Gerrit 2.6.2
  Fix NullPointerException when comparing AccessSections

5 files changed, 51 insertions, 5 deletions

diff --git a/Documentation/cmd-gsql.txt b/Documentation/cmd-gsql.txt
index b53670b368..7ddc41f67e 100644
--- a/Documentation/cmd-gsql.txt
+++ b/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
 ---------
diff --git a/ReleaseNotes/ReleaseNotes-2.6.2.txt b/ReleaseNotes/ReleaseNotes-2.6.2.txt
new file mode 100644
index 0000000000..cf963c243f
--- /dev/null
+++ b/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.
+
diff --git a/ReleaseNotes/index.txt b/ReleaseNotes/index.txt
index 092f149e14..974d4db904 100644
--- a/ReleaseNotes/index.txt
+++ b/ReleaseNotes/index.txt
@@ -9,6 +9,7 @@ Version 2.7.x
 [[2_6]]
 Version 2.6.x
 -------------
+* link:ReleaseNotes-2.6.2.html[2.6.2]
 * link:ReleaseNotes-2.6.html[2.6]
 
 [[2_5]]
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/AccessSection.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccessSection.java
index a9b5e85503..5ddf1ae249 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/data/AccessSection.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccessSection.java
@@ -124,7 +124,7 @@ public class AccessSection extends RefConfigSection implements
     if (!super.equals(obj) || !(obj instanceof AccessSection)) {
       return false;
     }
-    return new HashSet<Permission>(permissions).equals(new HashSet<Permission>(
-        ((AccessSection) obj).permissions));
+    return new HashSet<Permission>(getPermissions()).equals(new HashSet<Permission>(
+        ((AccessSection) obj).getPermissions()));
   }
 }
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java
index 0585651098..43fefba481 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java
@@ -241,8 +241,8 @@ public class Permission implements Comparable<Permission> {
     if (!name.equals(other.name) || exclusiveGroup != other.exclusiveGroup) {
       return false;
     }
-    return new HashSet<PermissionRule>(rules)
-        .equals(new HashSet<PermissionRule>(other.rules));
+    return new HashSet<PermissionRule>(getRules())
+        .equals(new HashSet<PermissionRule>(other.getRules()));
   }
 
   @Override