Merge branch 'stable-3.2'
* stable-3.2: Update git submodules Fix documentation of `container.slave` Fix documentation of `container.slave` Update git submodules Update git submodules Submit: Use updated change for response Remove Content-Type header from 'Submit Revision' example Update git submodules Add support for Elasticsearch version 7.8.* Fix `parent` in `gr-change-metadata` when there is no revision Change-Id: Ifaaad90a7343da4e301137616bc7c82e92bd6f3c
This commit is contained in:
@@ -28,7 +28,8 @@ public enum ElasticVersion {
|
||||
V7_4("7.4.*"),
|
||||
V7_5("7.5.*"),
|
||||
V7_6("7.6.*"),
|
||||
V7_7("7.7.*");
|
||||
V7_7("7.7.*"),
|
||||
V7_8("7.8.*");
|
||||
|
||||
private final String version;
|
||||
private final Pattern pattern;
|
||||
|
||||
@@ -214,7 +214,7 @@ public class Submit
|
||||
|
||||
updatedChange = op.merge(change, submitter, true, input, false);
|
||||
if (updatedChange.isMerged()) {
|
||||
return Response.ok(new Output(change));
|
||||
return Response.ok(new Output(updatedChange));
|
||||
}
|
||||
|
||||
throw new IllegalStateException(
|
||||
|
||||
Reference in New Issue
Block a user