Skip to content
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

Jump to bottom

Bump the 6.x branch to 6.5.0 #32361

Merged
merged 1 commit into from
Jul 25, 2018
Merged

Bump the 6.x branch to 6.5.0 #32361

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
2 changes: 1 addition & 1 deletion buildSrc/version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
elasticsearch = 6.4.0
elasticsearch = 6.5.0
lucene = 7.4.0

# optional dependencies
Expand Down
2 changes: 1 addition & 1 deletion docs/Versions.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
:version: 6.4.0
:version: 6.5.0
:major-version: 6.x
:lucene_version: 7.4.0
:lucene_version_path: 7_4_0
Expand Down
6 changes: 5 additions & 1 deletion server/src/main/java/org/elasticsearch/Version.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,10 @@ public class Version implements Comparable<Version>, ToXContentFragment {
public static final Version V_6_3_3 = new Version(V_6_3_3_ID, org.apache.lucene.util.Version.LUCENE_7_3_1);
public static final int V_6_4_0_ID = 6040099;
public static final Version V_6_4_0 = new Version(V_6_4_0_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_4_0);

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

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

public static Version fromId(int id) {
switch (id) {
case V_6_5_0_ID:
return V_6_5_0;
case V_6_4_0_ID:
return V_6_4_0;
case V_6_3_3_ID:
Expand Down