Merge branch 'stable-2.11' * stable-2.11: Remove unused imports in Helper.java Rename getPathSetWebLink to getPatchSetWebLink Improve class naming of group inclusion cache loaders Fix NPE when indexing changed lines Fix LDAP authentication for the RFC2307 server type Lazily lookup LDAP group memberships Configurable ldap.fetchMemberOfEagerly to optimize LDAP login Improve LDAP login times, transfer 40x less data. Reduce number of LDAP queries when having multiple accountBases Fix LDAP connection pool configuration. Improve method and variable names related to group inclusion caches Honor ldap.connectTimeout also without connection pooling Add config options of LDAP 'connection pooling' Change-Id: I2498f1eaa5ecd0d44ce4140394002f70424ab2ff

diff --git a/Documentation/dev-plugins.txt b/Documentation/dev-plugins.txt
index a672b177..ebc59f4 100644
--- a/Documentation/dev-plugins.txt
+++ b/Documentation/dev-plugins.txt

@@ -1796,7 +1796,7 @@
   private String imageUrl = "http://placehold.it/16x16.gif";
 
   @Override
-  public WebLinkInfo getPathSetWebLink(String projectName, String commit) {
+  public WebLinkInfo getPatchSetWebLink(String projectName, String commit) {
     return new WebLinkInfo(name,
         imageUrl,
         String.format(placeHolderUrlProjectCommit, project, commit),

diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/PatchSetWebLink.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/PatchSetWebLink.java
index c97bddd..ad74849 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/PatchSetWebLink.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/PatchSetWebLink.java

@@ -34,5 +34,5 @@
    * @return WebLinkInfo that links to patch set in external service,
    * null if there should be no link.
    */
-  WebLinkInfo getPathSetWebLink(final String projectName, final String commit);
+  WebLinkInfo getPatchSetWebLink(final String projectName, final String commit);
 }

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java b/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
index 173c4bd..1403e60 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java

@@ -85,7 +85,7 @@
 
       @Override
       public WebLinkInfo apply(WebLink webLink) {
-        return ((PatchSetWebLink)webLink).getPathSetWebLink(project.get(), commit);
+        return ((PatchSetWebLink)webLink).getPatchSetWebLink(project.get(), commit);
       }
     });
   }
@@ -174,4 +174,4 @@
         .transform(transformer)
         .filter(INVALID_WEBLINK);
   }
-}
\ No newline at end of file
+}

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeField.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeField.java
index 9f90e37..2993739 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeField.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeField.java

@@ -464,8 +464,10 @@
         @Override
         public Integer get(ChangeData input, FillArgs args)
             throws OrmException {
-          ChangedLines lines = input.changedLines();
-          return lines != null ? lines.insertions : null;
+
+          return input.changedLines() != null
+              ? input.changedLines().insertions
+              : null;
         }
       };
 
@@ -476,8 +478,9 @@
         @Override
         public Integer get(ChangeData input, FillArgs args)
             throws OrmException {
-          ChangedLines lines = input.changedLines();
-          return lines != null ? lines.deletions : null;
+          return input.changedLines() != null
+              ? input.changedLines().deletions
+              : null;
         }
       };
 
@@ -488,11 +491,10 @@
         @Override
         public Integer get(ChangeData input, FillArgs args)
             throws OrmException {
-          ChangedLines lines = input.changedLines();
-          if (lines == null) {
-            return null;
-          }
-          return lines.insertions + lines.deletions;
+          ChangedLines changedLines = input.changedLines();
+          return changedLines != null
+              ? changedLines.insertions + changedLines.deletions
+              : null;
         }
       };
 

diff --git a/plugins/cookbook-plugin b/plugins/cookbook-plugin
index 95ce239..de0c0d0 160000
--- a/plugins/cookbook-plugin
+++ b/plugins/cookbook-plugin

@@ -1 +1 @@
-Subproject commit 95ce239be7e0c555ea7cc56a7bbe727ece80c817
+Subproject commit de0c0d019be1ce81b681ec4365bec169602c4b3c