diff options
| author | Edwin Kempin <ekempin@google.com> | 2018-12-28 14:16:55 +0100 |
|---|---|---|
| committer | Edwin Kempin <ekempin@google.com> | 2018-12-28 16:08:01 +0100 |
| commit | 1931de49f0312be56c06ca29ecbce6e0fe86b587 (patch) | |
| tree | 6ae05894c1ada89b4b962c9c97f70ce98215bd83 | |
| parent | 777a8cd1e0b95d2ad847529473a7669a056adcf5 (diff) | |
| parent | 591d3557640c665d6303f43bb6036ed085a6bd38 (diff) | |
Merge branch stable-2.12
* stable-2.12:
Update JGit to latest 4.5.x release
Update JGit to latest 4.5.x release
Resource exhausted because of unclosed LDAP connection
Change-Id: I78739a139022014d333bfbc4a708bd84ee3f7e15
Signed-off-by: Edwin Kempin <ekempin@google.com>
| -rw-r--r-- | gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java | 2 | ||||
| m--------- | plugins/reviewnotes | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java index d71cfb4944..5cdd2f401f 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java @@ -606,7 +606,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest { PushResult pr = GitUtil.pushHead( testRepo, "refs/for/foo%base=" + rBase.getCommit().name(), false, false); - assertThat(pr.getMessages()).contains("changes: new: 1, refs: 1, done"); + assertThat(pr.getMessages()).containsMatch("changes: .*new: 1.*done"); assertTwoChangesWithSameRevision(r); } diff --git a/plugins/reviewnotes b/plugins/reviewnotes -Subproject 275eeaa3ab917696da1a20b3a9fba56eca8ecc6 +Subproject a52ea118b403e0f8ffc50c77e5471079e18c14d |