Skip to content

Commit c7ea034

Browse files
committed
[Rollup] Update versions after backport
Both serialization and yaml test skips
1 parent 5b7446b commit c7ea034

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ public boolean waitForCompletion() {
7979
public void readFrom(StreamInput in) throws IOException {
8080
super.readFrom(in);
8181
id = in.readString();
82-
// TODO change this after backport
83-
if (in.getVersion().onOrAfter(Version.CURRENT)) {
82+
if (in.getVersion().onOrAfter(Version.V_6_6_0)) {
8483
waitForCompletion = in.readBoolean();
8584
timeout = in.readTimeValue();
8685
}
@@ -90,8 +89,7 @@ public void readFrom(StreamInput in) throws IOException {
9089
public void writeTo(StreamOutput out) throws IOException {
9190
super.writeTo(out);
9291
out.writeString(id);
93-
// TODO change this after backport
94-
if (out.getVersion().onOrAfter(Version.CURRENT)) {
92+
if (out.getVersion().onOrAfter(Version.V_6_6_0)) {
9593
out.writeBoolean(waitForCompletion);
9694
out.writeTimeValue(timeout);
9795
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ setup:
8787
---
8888
"Test wait_for_completion default timeout":
8989
- skip:
90-
version: " - 6.6.0"
90+
version: " - 6.5.99"
9191
reason: wait_for_completion option was added in 6.6
9292

9393
- do:
@@ -108,7 +108,7 @@ setup:
108108
---
109109
"Test wait_for_completion with custom timeout":
110110
- skip:
111-
version: " - 6.6.0"
111+
version: " - 6.5.99"
112112
reason: wait_for_completion option was added in 6.6
113113

114114
- do:

0 commit comments

Comments
 (0)