Merge branch 'apache:master' into master

apache · Aug 9, 2024 · d58247c · d58247c
2 parents 591f70b + c9ad55f
commit d58247c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/helix-rest/src/test/java/org/apache/helix/rest/server/TestPerInstanceAccessor.java b/helix-rest/src/test/java/org/apache/helix/rest/server/TestPerInstanceAccessor.java
@@ -597,6 +597,9 @@ public void updateInstance() throws Exception {
     Assert.assertEquals(response.getStatus(), Response.Status.OK.getStatusCode());
     Assert.assertTrue(evacuateFinishedResult.get("successful"));
 
+    // Remove instance created for evacuate test
+    delete("clusters/" + CLUSTER_NAME + "/instances/" + test_instance_name, Response.Status.OK.getStatusCode());
+
     // test setPartitionsToError
     List<String> partitionsToSetToError = Arrays.asList(CLUSTER_NAME + dbName + "7");
 

diff --git a/helix-style-intellij.xml b/helix-style-intellij.xml
@@ -131,7 +131,7 @@
     <option name="WHILE_BRACE_FORCE" value="3" />
     <option name="FOR_BRACE_FORCE" value="3" />
     <option name="VARIABLE_ANNOTATION_WRAP" value="2" />
-    <option name="ENUM_CONSTANTS_WRAP" value="5" />
+    <option name="ENUM_CONSTANTS_WRAP" value="2" />
     <option name="PARENT_SETTINGS_INSTALLED" value="true" />
     <indentOptions>
       <option name="INDENT_SIZE" value="2" />