Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
Upgrade elasticsearch-rest-client to 7.3.1
Add .gitreview file
DeleteDraftComments: Don't update change modified timestamp
ChangeIT: set submittableAfterLosingPermissions private
Rebase: Don't swallow caught exception
Output NoteDb migration progress to Flogger
Update git submodules
DefaultChangeReportFormatter: Make constructor and urlFormatter visible
StarredChangesUtil: Fix NPE when ref to be deleted doesn't exist
StarredChangesUtil: Throw LockFailureException on LOCK_FAILURE
Add test for creating a change on a non-existing base change
Rebase: Do not fail with 500 ISE if non-existing change is given as base
Fix detecting changes of parent trees when computing change kind for merge commit
Remove duplicate descriptions of fields in Requirement JSON entity
InternalAccountQuery: Add back the oneByExternalId method
Set version to 2.16.11-SNAPSHOT
Update the newly added .gitreview file to point to stable-3.0.
Change-Id: I717026f02a6a7a14dcab72a166f25c2196a6a6ae
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
index 299777e..d214ae0 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
@@ -59,7 +59,7 @@
case V7_2:
return "blacktop/elasticsearch:7.2.1";
case V7_3:
- return "blacktop/elasticsearch:7.3.0";
+ return "blacktop/elasticsearch:7.3.1";
}
throw new IllegalStateException("No tests for version: " + version.name());
}
