Merge branch 'stable-2.15' into stable-2.16
* stable-2.15: Upgrade elasticsearch-rest-client to 7.3.1 Add .gitreview file Update the newly added .gitreview file to point to stable-2.16. Change-Id: I9ca52ec3d90dea1b44321be4eb648448abafff1e
This commit is contained in:
commit
faf30c51fc
5
.gitreview
Normal file
5
.gitreview
Normal file
@ -0,0 +1,5 @@
|
||||
[gerrit]
|
||||
host=gerrit-review.googlesource.com
|
||||
scheme=https
|
||||
project=gerrit.git
|
||||
defaultbranch=stable-2.16
|
@ -144,6 +144,11 @@ by clicking the 'Obtain Password' link on the
|
||||
link:https://gerrit-review.googlesource.com/#/settings/http-password[HTTP
|
||||
Password tab of the user settings page].
|
||||
|
||||
Alternately, you may use the
|
||||
link:https://pypi.org/project/git-review/[git-review] tool to submit changes
|
||||
to Gerrit. If you do, it will set up the Change-Id hook and `gerrit` remote
|
||||
for you. You will still need to do the HTTP access step.
|
||||
|
||||
[[style]]
|
||||
=== Style
|
||||
|
||||
|
@ -251,7 +251,10 @@ link:https://gerrit-review.googlesource.com/admin/repos/gerrit,branches[
|
||||
Gerrit Web UI] or by push.
|
||||
|
||||
* Push the commits done on `stable-$version` to `refs/for/stable-$version` and
|
||||
get them merged
|
||||
get them merged.
|
||||
|
||||
* Create a change updating the `defaultbranch` field in the `.gitreview`
|
||||
to match the branch name created.
|
||||
|
||||
|
||||
[[push-tag]]
|
||||
|
@ -1119,8 +1119,8 @@ maven_jar(
|
||||
# and httpasyncclient as necessary.
|
||||
maven_jar(
|
||||
name = "elasticsearch-rest-client",
|
||||
artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.3.0",
|
||||
sha1 = "3cdc211c8efb72c202107b40dee356f4f2f0f9bd",
|
||||
artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.3.1",
|
||||
sha1 = "f5793c89b50a159cbb3e15e17bb981ff854cbe51",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
|
@ -59,7 +59,7 @@ public class ElasticContainer extends ElasticsearchContainer {
|
||||
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());
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user