Skip to content

Update BWC versions after backport of #78551 #79373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 18, 2021
Merged

Update BWC versions after backport of #78551 #79373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...gest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/290_versioned_update.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
"Test pipeline versioned updates":
- skip:
version: " - 7.99.99"
reason: "re-enable in 7.16+ when backported"
version: " - 7.15.99"
reason: "added versioned updates in 7.16.0"

- do:
ingest.put_pipeline:
Expand Down
4 changes: 2 additions & 2 deletions server/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public PutPipelineRequest(StreamInput in) throws IOException {
id = in.readString();
source = in.readBytesReference();
xContentType = in.readEnum(XContentType.class);
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
if (in.getVersion().onOrAfter(Version.V_7_16_0)) {
version = in.readOptionalInt();
} else {
version = null;
Expand Down Expand Up @@ -86,7 +86,7 @@ public void writeTo(StreamOutput out) throws IOException {
out.writeString(id);
out.writeBytesReference(source);
XContentHelper.writeTo(out, xContentType);
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
if (out.getVersion().onOrAfter(Version.V_7_16_0)) {
out.writeOptionalInt(version);
}
}
Expand Down