diff options
author | Nik Everett <nik9000@gmail.com> | 2017-05-26 18:36:32 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-26 18:36:32 -0400 |
commit | 5da8ce8318efda1fdcc367d97dc294feaf6285cc (patch) | |
tree | d10df28af430fc4d384b40027d0bf46aab6a7429 /modules | |
parent | 23fb36cc879f17908445c8bd1415c2a4611c12ca (diff) |
Remove the need for _UNRELEASED suffix in versions (#24798)
Removes the need for the `_UNRELEASED` suffix on versions by detecting if a version should be unreleased or not based on the versions around it. This should make it simpler to automate the task of adding a new version label.
Diffstat (limited to 'modules')
3 files changed, 4 insertions, 4 deletions
diff --git a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MultiSearchTemplateRequest.java b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MultiSearchTemplateRequest.java index fceb6fb98d..bd294db6d2 100644 --- a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MultiSearchTemplateRequest.java +++ b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MultiSearchTemplateRequest.java @@ -112,7 +112,7 @@ public class MultiSearchTemplateRequest extends ActionRequest implements Composi @Override public void readFrom(StreamInput in) throws IOException { super.readFrom(in); - if (in.getVersion().onOrAfter(Version.V_5_5_0_UNRELEASED)) { + if (in.getVersion().onOrAfter(Version.V_5_5_0)) { maxConcurrentSearchRequests = in.readVInt(); } requests = in.readStreamableList(SearchTemplateRequest::new); @@ -121,7 +121,7 @@ public class MultiSearchTemplateRequest extends ActionRequest implements Composi @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getVersion().onOrAfter(Version.V_5_5_0_UNRELEASED)) { + if (out.getVersion().onOrAfter(Version.V_5_5_0)) { out.writeVInt(maxConcurrentSearchRequests); } out.writeStreamableList(requests); diff --git a/modules/parent-join/src/main/java/org/elasticsearch/join/query/HasChildQueryBuilder.java b/modules/parent-join/src/main/java/org/elasticsearch/join/query/HasChildQueryBuilder.java index 50fb925de6..f574236b35 100644 --- a/modules/parent-join/src/main/java/org/elasticsearch/join/query/HasChildQueryBuilder.java +++ b/modules/parent-join/src/main/java/org/elasticsearch/join/query/HasChildQueryBuilder.java @@ -126,7 +126,7 @@ public class HasChildQueryBuilder extends AbstractQueryBuilder<HasChildQueryBuil out.writeInt(maxChildren); out.writeVInt(scoreMode.ordinal()); out.writeNamedWriteable(query); - if (out.getVersion().before(Version.V_5_5_0_UNRELEASED)) { + if (out.getVersion().before(Version.V_5_5_0)) { final boolean hasInnerHit = innerHitBuilder != null; out.writeBoolean(hasInnerHit); if (hasInnerHit) { diff --git a/modules/parent-join/src/main/java/org/elasticsearch/join/query/HasParentQueryBuilder.java b/modules/parent-join/src/main/java/org/elasticsearch/join/query/HasParentQueryBuilder.java index 559f5530c3..7bcbf7c611 100644 --- a/modules/parent-join/src/main/java/org/elasticsearch/join/query/HasParentQueryBuilder.java +++ b/modules/parent-join/src/main/java/org/elasticsearch/join/query/HasParentQueryBuilder.java @@ -121,7 +121,7 @@ public class HasParentQueryBuilder extends AbstractQueryBuilder<HasParentQueryBu out.writeString(type); out.writeBoolean(score); out.writeNamedWriteable(query); - if (out.getVersion().before(Version.V_5_5_0_UNRELEASED)) { + if (out.getVersion().before(Version.V_5_5_0)) { final boolean hasInnerHit = innerHitBuilder != null; out.writeBoolean(hasInnerHit); if (hasInnerHit) { |