Skip to content

Commit d0d8b0c

Browse files
authored
Bump 6.6 branch to version 6.6.1 (#37975)
1 parent 85675df commit d0d8b0c

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

buildSrc/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
elasticsearch = 6.6.0
1+
elasticsearch = 6.6.1
22
lucene = 7.6.0
33

44
# optional dependencies

server/src/main/java/org/elasticsearch/Version.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -198,12 +198,12 @@ public class Version implements Comparable<Version>, ToXContentFragment {
198198
public static final Version V_6_5_3 = new Version(V_6_5_3_ID, org.apache.lucene.util.Version.LUCENE_7_5_0);
199199
public static final int V_6_5_4_ID = 6050499;
200200
public static final Version V_6_5_4 = new Version(V_6_5_4_ID, org.apache.lucene.util.Version.LUCENE_7_5_0);
201-
public static final int V_6_5_5_ID = 6050599;
202-
public static final Version V_6_5_5 = new Version(V_6_5_5_ID, org.apache.lucene.util.Version.LUCENE_7_5_0);
203201
public static final int V_6_6_0_ID = 6060099;
204202
public static final Version V_6_6_0 = new Version(V_6_6_0_ID, org.apache.lucene.util.Version.LUCENE_7_6_0);
203+
public static final int V_6_6_1_ID = 6060199;
204+
public static final Version V_6_6_1 = new Version(V_6_6_1_ID, org.apache.lucene.util.Version.LUCENE_7_6_0);
205205

206-
public static final Version CURRENT = V_6_6_0;
206+
public static final Version CURRENT = V_6_6_1;
207207

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

217217
public static Version fromId(int id) {
218218
switch (id) {
219+
case V_6_6_1_ID:
220+
return V_6_6_1;
219221
case V_6_6_0_ID:
220222
return V_6_6_0;
221-
case V_6_5_5_ID:
222-
return V_6_5_5;
223223
case V_6_5_4_ID:
224224
return V_6_5_4;
225225
case V_6_5_3_ID:

x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/action/TransportOpenJobActionTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,8 +441,9 @@ public void testSelectLeastLoadedMlNode_indexJobsCannotBeAssignedToPre660Node()
441441
Job job = jobWithRules("v660-job");
442442
Assignment result = TransportOpenJobAction.selectLeastLoadedMlNode("v660-job", job, cs.build(), 2, 10, 30, memoryTracker, logger);
443443
assertNull(result.getExecutorNode());
444-
assertEquals("Not opening job [v660-job] on node [_node_name1] version [6.5.0], " +
445-
"because this node does not support jobs of version [6.6.0]", result.getExplanation());
444+
assertThat(result.getExplanation(),
445+
containsString("Not opening job [v660-job] on node [_node_name1] version [6.5.0], " +
446+
"because this node does not support jobs of version [6.6."));
446447

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

0 commit comments

Comments
 (0)