commit | 17abd7f316b037583ab6489ca89f766879486d7e | [log] [tgz] |
---|---|---|
author | Edwin Kempin <ekempin@google.com> | Fri Dec 28 16:03:33 2018 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Dec 28 16:03:33 2018 +0000 |
tree | 6ae05894c1ada89b4b962c9c97f70ce98215bd83 | |
parent | 777a8cd1e0b95d2ad847529473a7669a056adcf5 [diff] | |
parent | 1931de49f0312be56c06ca29ecbce6e0fe86b587 [diff] |
Merge "Merge branch stable-2.12" into stable-2.13
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 d71cfb4..5cdd2f4 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 @@ 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 index 275eeaa..a52ea11 160000 --- a/plugins/reviewnotes +++ b/plugins/reviewnotes
@@ -1 +1 @@ -Subproject commit 275eeaa3ab917696da1a20b3a9fba56eca8ecc6c +Subproject commit a52ea118b403e0f8ffc50c77e5471079e18c14d0