diff options
| author | Edwin Kempin <ekempin@google.com> | 2018-12-27 13:23:42 +0100 |
|---|---|---|
| committer | Edwin Kempin <ekempin@google.com> | 2018-12-27 13:23:42 +0100 |
| commit | adb699ffb8c68a8a01c52f4889dadace8baaeba2 (patch) | |
| tree | ff7466c5a96bc49aac8959eaba5e735401341151 | |
| parent | 4ecf2efa7a6ca561784d97f70affbf2b3a9c84ec (diff) | |
| parent | 4a3c2d14caa7355cf9b12a14ff931bab29b539dc (diff) | |
Merge branch stable-2.9
* stable-2.9:
Update JGit to latest 4.5.x release
Resource exhausted because of unclosed LDAP connection
Change-Id: I85cdc1fec9689d34ebbcb19d92484a90baf169e9
Signed-off-by: Edwin Kempin <ekempin@google.com>
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java | 2 | ||||
| m--------- | plugins/reviewnotes | 0 |
2 files changed, 0 insertions, 2 deletions
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 cf348ad9c8..403901aedf 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 @@ -483,12 +483,10 @@ public class MergeUtil { 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 -Subproject 0b5aab68206744f6a41abba63aaa3714f354fa8 +Subproject 4f5831f1c319753ee4ef16c35778f49397985af |