Skip to content

Commit

Permalink
Bump the 6.x branch to 6.6.0 (#34846)
Browse files Browse the repository at this point in the history
This commit bumps the 6.x branch of elasticsearch to 6.6.0.
  • Loading branch information
tlrx committed Oct 25, 2018
1 parent 281b44b commit 57950cf
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion buildSrc/version.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
elasticsearch = 6.5.0
elasticsearch = 6.6.0
lucene = 7.5.0

# optional dependencies
Expand Down
2 changes: 1 addition & 1 deletion docs/Versions.asciidoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
:version: 6.5.0
:version: 6.6.0
:major-version: 6.x
:lucene_version: 7.5.0
:lucene_version_path: 7_5_0
Expand Down
6 changes: 5 additions & 1 deletion server/src/main/java/org/elasticsearch/Version.java
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,10 @@ public class Version implements Comparable<Version>, ToXContentFragment {
public static final Version V_6_4_3 = new Version(V_6_4_3_ID, org.apache.lucene.util.Version.LUCENE_7_4_0);
public static final int V_6_5_0_ID = 6050099;
public static final Version V_6_5_0 = new Version(V_6_5_0_ID, org.apache.lucene.util.Version.LUCENE_7_5_0);
public static final int V_6_6_0_ID = 6060099;
public static final Version V_6_6_0 = new Version(V_6_6_0_ID, org.apache.lucene.util.Version.LUCENE_7_5_0);

public static final Version CURRENT = V_6_5_0;
public static final Version CURRENT = V_6_6_0;

static {
assert CURRENT.luceneVersion.equals(org.apache.lucene.util.Version.LATEST) : "Version must be upgraded to ["
Expand All @@ -200,6 +202,8 @@ public static Version readVersion(StreamInput in) throws IOException {

public static Version fromId(int id) {
switch (id) {
case V_6_6_0_ID:
return V_6_6_0;
case V_6_5_0_ID:
return V_6_5_0;
case V_6_4_3_ID:
Expand Down

0 comments on commit 57950cf

Please sign in to comment.