summaryrefslogtreecommitdiff
path: root/core/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java
diff options
context:
space:
mode:
authorSimon Willnauer <simonw@apache.org>2017-05-17 17:27:09 +0200
committerGitHub <noreply@github.com>2017-05-17 17:27:09 +0200
commit2ccc223ff761043807683f34b29c693af6c94d95 (patch)
treefd4892db6847dd2cbf26940ccd7105c011fb13d9 /core/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java
parent0189a65e6bfc623813c6c088d19a0509fbeb64da (diff)
Fix Version based BWC and set correct minCompatVersion (#24732)
Approaching the release of 6.0 we need to sort out the usage of `Version#minimumCompatibilityVersion` which was still set to 5.0.0. Now this change moves it to the latest released version of 5.x (5.4 at this point) to ensure we are compatible with the latest minor of the previous major. This change also removes all the `_UNRELEASED` from the versions that where released and drops versions that were never released and are not expected to be released (bugfixes in minors that are not the latest in the previous major).
Diffstat (limited to 'core/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java')
-rw-r--r--core/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java b/core/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java
index b6eb84b03b..768f7e7fd0 100644
--- a/core/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java
+++ b/core/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java
@@ -213,7 +213,7 @@ public final class InnerHitBuilder extends ToXContentToBytes implements Writeabl
name = in.readOptionalString();
nestedPath = in.readOptionalString();
parentChildType = in.readOptionalString();
- if (in.getVersion().onOrAfter(Version.V_5_2_0_UNRELEASED)) {
+ if (in.getVersion().onOrAfter(Version.V_5_2_0)) {
ignoreUnmapped = in.readBoolean();
}
from = in.readVInt();
@@ -254,7 +254,7 @@ public final class InnerHitBuilder extends ToXContentToBytes implements Writeabl
out.writeOptionalString(name);
out.writeOptionalString(nestedPath);
out.writeOptionalString(parentChildType);
- if (out.getVersion().onOrAfter(Version.V_5_2_0_UNRELEASED)) {
+ if (out.getVersion().onOrAfter(Version.V_5_2_0)) {
out.writeBoolean(ignoreUnmapped);
}
out.writeVInt(from);