| commit | 55cf6e690f178b839a348ab7e61ac400acb78079 | [log] [tgz] |
|---|---|---|
| author | Edwin Kempin <ekempin@google.com> | Thu Dec 27 13:50:34 2018 +0100 |
| committer | Edwin Kempin <ekempin@google.com> | Thu Dec 27 13:50:34 2018 +0100 |
| tree | 59dbfd0f519167670822efdca2280114efae1b40 | |
| parent | 5babd378006fffcf73aad7157955dd943128d42e [diff] | |
| parent | adb699ffb8c68a8a01c52f4889dadace8baaeba2 [diff] |
Merge branch stable-2.10 * stable-2.10: Update JGit to latest 4.5.x release Resource exhausted because of unclosed LDAP connection Change-Id: I1e07c7f8e2e4d08e0a06a5bb5dab6873408050c3 Signed-off-by: Edwin Kempin <ekempin@google.com>
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java index 84be4a1..7cbf9fa 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java
@@ -474,12 +474,10 @@ protected ObjectInserter delegate() { return delegate; } - @Override public PackParser newPackParser(InputStream in) throws IOException { throw new UnsupportedOperationException(); } - @Override public void flush() throws IOException { // Do nothing.
diff --git a/plugins/reviewnotes b/plugins/reviewnotes index f6403a1..4efc9a1 160000 --- a/plugins/reviewnotes +++ b/plugins/reviewnotes
@@ -1 +1 @@ -Subproject commit f6403a1ed35e908a4828fdc9168ed752fa178c69 +Subproject commit 4efc9a167fe66dc019f495abe848b2296553b4a0