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

Bump 6.6 branch to version 6.6.1 #37975

Merged
merged 2 commits into from
Jan 29, 2019
Merged

Bump 6.6 branch to version 6.6.1 #37975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14196fe
Bump 6.6 branch to version 6.6.1
matriv Jan 29, 2019
5c94cc7
Correcting ML test for 6.6.1 bump
benwtrent Jan 29, 2019
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.6.0
elasticsearch = 6.6.1
lucene = 7.6.0

# optional dependencies
Expand Down
10 changes: 5 additions & 5 deletions 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 @@ -198,12 +198,12 @@ public class Version implements Comparable<Version>, ToXContentFragment {
public static final Version V_6_5_3 = new Version(V_6_5_3_ID, org.apache.lucene.util.Version.LUCENE_7_5_0);
public static final int V_6_5_4_ID = 6050499;
public static final Version V_6_5_4 = new Version(V_6_5_4_ID, org.apache.lucene.util.Version.LUCENE_7_5_0);
public static final int V_6_5_5_ID = 6050599;
public static final Version V_6_5_5 = new Version(V_6_5_5_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_6_0);
public static final int V_6_6_1_ID = 6060199;
public static final Version V_6_6_1 = new Version(V_6_6_1_ID, org.apache.lucene.util.Version.LUCENE_7_6_0);

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

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

public static Version fromId(int id) {
switch (id) {
case V_6_6_1_ID:
return V_6_6_1;
case V_6_6_0_ID:
return V_6_6_0;
case V_6_5_5_ID:
return V_6_5_5;
case V_6_5_4_ID:
return V_6_5_4;
case V_6_5_3_ID:
Expand Down
5 changes: 3 additions & 2 deletions ...lugin/ml/src/test/java/org/elasticsearch/xpack/ml/action/TransportOpenJobActionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,8 +441,9 @@ public void testSelectLeastLoadedMlNode_indexJobsCannotBeAssignedToPre660Node()
Job job = jobWithRules("v660-job");
Assignment result = TransportOpenJobAction.selectLeastLoadedMlNode("v660-job", job, cs.build(), 2, 10, 30, memoryTracker, logger);
assertNull(result.getExecutorNode());
assertEquals("Not opening job [v660-job] on node [_node_name1] version [6.5.0], " +
"because this node does not support jobs of version [6.6.0]", result.getExplanation());
assertThat(result.getExplanation(),
containsString("Not opening job [v660-job] on node [_node_name1] version [6.5.0], " +
"because this node does not support jobs of version [6.6."));

nodes = DiscoveryNodes.builder()
.add(new DiscoveryNode("_node_name1", "_node_id1", new TransportAddress(InetAddress.getLoopbackAddress(), 9300),
Expand Down