Sync with 2.x

Signed-off-by: Craig Perkins <[email protected]>
opensearch-project · Oct 23, 2024 · 8cbc322 · 8cbc322
1 parent 897e2e1
commit 8cbc322
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 11 deletions.
diff --git a/...h/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigActionTests.java b/...h/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigActionTests.java
@@ -12,7 +12,6 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/...ensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigActionTests.java b/...ensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigActionTests.java
@@ -12,7 +12,6 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -62,10 +61,6 @@ public void init() {
         UsageService usageService = new UsageService();
         threadPool = new TestThreadPool("test");
         nodeClient = new NodeClient(Settings.EMPTY, threadPool);
-<<<<<<< HEAD
-=======
-        identityService = new IdentityService(Settings.EMPTY, threadPool, List.of());
->>>>>>> 2.x
         restController =
                 new RestController(
                         Collections.emptySet(),

diff --git a/...anceanalyzer/http_action/config/PerformanceAnalyzerOverridesClusterConfigActionTests.java b/...anceanalyzer/http_action/config/PerformanceAnalyzerOverridesClusterConfigActionTests.java
@@ -13,7 +13,6 @@
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -63,10 +62,6 @@ public void init() {
         UsageService usageService = new UsageService();
         threadPool = new TestThreadPool("test");
         nodeClient = new NodeClient(Settings.EMPTY, threadPool);
-<<<<<<< HEAD
-=======
-        identityService = new IdentityService(Settings.EMPTY, threadPool, List.of());
->>>>>>> 2.x
         restController =
                 new RestController(
                         Collections.emptySet(),