honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Rollup] Update versions after backport 

Both serialization and yaml test skips
This commit is contained in:
Zachary Tong 2018-11-14 09:56:45 -05:00
parent 5b7446bb5f
commit c7ea0343d2
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/action/StopRollupJobAction.java
View File

@ -79,8 +79,7 @@ public class StopRollupJobAction extends Action<StopRollupJobAction.Response> {
public void readFrom(StreamInput in) throws IOException { public void readFrom(StreamInput in) throws IOException {
super.readFrom(in); super.readFrom(in);
id = in.readString(); id = in.readString();
// TODO change this after backport if (in.getVersion().onOrAfter(Version.V_6_6_0)) {
if (in.getVersion().onOrAfter(Version.CURRENT)) {
waitForCompletion = in.readBoolean(); waitForCompletion = in.readBoolean();
timeout = in.readTimeValue(); timeout = in.readTimeValue();
} }
@ -90,8 +89,7 @@ public class StopRollupJobAction extends Action<StopRollupJobAction.Response> {
public void writeTo(StreamOutput out) throws IOException { public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out); super.writeTo(out);
out.writeString(id); out.writeString(id);
// TODO change this after backport if (out.getVersion().onOrAfter(Version.V_6_6_0)) {
if (out.getVersion().onOrAfter(Version.CURRENT)) {
out.writeBoolean(waitForCompletion); out.writeBoolean(waitForCompletion);
out.writeTimeValue(timeout); out.writeTimeValue(timeout);
} }

4
x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/stop_job.yml
View File

@ -87,7 +87,7 @@ setup:
--- ---
"Test wait_for_completion default timeout": "Test wait_for_completion default timeout":
- skip: - skip:
version: " - 6.6.0" version: " - 6.5.99"
reason: wait_for_completion option was added in 6.6 reason: wait_for_completion option was added in 6.6
- do: - do:
@ -108,7 +108,7 @@ setup:
--- ---
"Test wait_for_completion with custom timeout": "Test wait_for_completion with custom timeout":
- skip: - skip:
version: " - 6.6.0" version: " - 6.5.99"
reason: wait_for_completion option was added in 6.6 reason: wait_for_completion option was added in 6.6
- do: - do: