Merge branch 'stable-2.11'

* stable-2.11:
  SshDaemon: Don't use deprecated IoAcceptor.dispose()
  PatchListLoader: Don't use deprecated TemporaryBuffer.LocalFile constructor
  Fix unused exception throws in EncryptedContactStore
  Remove unused imports
  Don't use deprecated PGPPublicKeyRingCollection constructor
  Print proper name for mergeability check tasks in show-queue command
  Print proper name for ListenableFutureTask in show-queue command
  Work around asciidoctor handling of nested ` and *
  Revert "Revert "Allow configuration of SSH rekey values""
  Revert "Revert "SSHD: Allow ECDSA based public key authentication""
  Revert "Revert "SSHD: Prevent double authentication for the same public key""
  Revert "Downgrade SSHD to 0.9.0-4-g5967cfd"
  Recommend --data-binary flag when testing submit rules from curl
  Change edit shortcut from 'm' to 'e'
  Fix NPE in MergeabilityCache.getIfPresent
  Fix F5 shortcut being hijacked by edit topic in Firefox
  Update 2.11 release notes
  Update version to 2.10.2
  Release notes for Gerrit 2.10.2
  Do not return 403 when clicking on Gitweb breadcrumb
  Add log messages to troubleshoot OAuth/OpenID linking
  Remove unused imports
  Convert to new AutoCloseable instances coming in JGit 4.0
  Remove unused OAuthToken in authorisation URL
  OnlineReindexer: log the success/failure numbers on exit
  Work around MyersDiff infinite loop in PatchListLoader
  Bind SecureStore and SecureStoreClassName in WebAppInitializer
  Update replication plugin
  Rework intra line diff to interrupt threads instead of killing them
  Update JGit to 3.7.0.201502260915-r.58-g65c379e
  Update replication plugin
  Workaround a RecursiveMerger bug [1], avoid online reindexing failure
  OAuth: Allow to link claimed identity to existing accounts
  OAuth: Allow to change username
  Allow PatchListLoader to use recursive merger
  Allow plugins to use self-provided licenses for used Maven Jars

Change-Id: Ie7f96abd97bd2c7e9205a708eed11f9052546187

ReleaseNotes/ReleaseNotes-2.10.2.txt

@@ -0,0 +1,31 @@
+Release notes for Gerrit 2.10.2
+===============================
+
+There are no schema changes from link:ReleaseNotes-2.10.1.html[2.10.1].
+
+Download:
+link:https://gerrit-releases.storage.googleapis.com/gerrit-2.10.2.war[
+https://gerrit-releases.storage.googleapis.com/gerrit-2.10.2.war]
+
+Bug Fixes
+---------
+
+* Work around MyersDiff infinite loop in PatchListLoader. If the MyersDiff diff
+doesn't finish within 5 seconds, interrupt it and fall back to a different diff
+algorithm. From the user perspective, the only difference when the infinite
+loop is detected is that the files in the commit will not be compared in-depth,
+which will result in bigger edit regions.
+
+Secondary Index
+---------------
+
+* Online reindexing: log the number of done/failed changes in the error_log.
+Administrators can use the logged information to decide whether to activate the
+new index version or not.
+
+Gitweb
+------
+
+* Do not return `Forbidden` when clicking on Gitweb breadcrumb. Now when the
+user clicks on the parent folder, redirect to Gerrit projects list screen with
+the parent folder path as the filter.

ReleaseNotes/ReleaseNotes-2.11.txt

@@ -8,7 +8,8 @@ link:https://gerrit-releases.storage.googleapis.com/gerrit-2.11.war[
 https://gerrit-releases.storage.googleapis.com/gerrit-2.11.war]
 
 Gerrit 2.11 includes the bug fixes done with
-link:ReleaseNotes-2.10.1.html[Gerrit 2.10.1].
+link:ReleaseNotes-2.10.1.html[Gerrit 2.10.1] and
+link:ReleaseNotes-2.10.2.html[Gerrit 2.10.2].
 These bug fixes are *not* listed in these release notes.
 
 

ReleaseNotes/index.txt

@@ -9,6 +9,7 @@ Version 2.11.x
 [[2_10]]
 Version 2.10.x
 --------------
+* link:ReleaseNotes-2.10.2.html[2.10.2]
 * link:ReleaseNotes-2.10.1.html[2.10.1]
 * link:ReleaseNotes-2.10.html[2.10]