resolve conflicts

Signed-off-by: Jackie Han <jkhanjob@gmail.com>
opensearch-project · Sep 3, 2024 · f9bf688 · f9bf688
1 parent 3ebc42d
commit f9bf688
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/...g/opensearch/action/admin/indices/mapping/get/IndexAnomalyDetectorActionHandlerTests.java b/...g/opensearch/action/admin/indices/mapping/get/IndexAnomalyDetectorActionHandlerTests.java
@@ -853,8 +853,7 @@ public <Request extends ActionRequest, Response extends ActionResponse> void doE
                         null,
                         detector.getCustomResultIndexMinSize(),
                         detector.getCustomResultIndexMinAge(),
-                        detector.getCustomResultIndexTTL(),
-                        false
+                        detector.getCustomResultIndexTTL()
                     );
                     try {
                         listener.onResponse((Response) TestHelpers.createGetResponse(clone, clone.getId(), CommonName.CONFIG_INDEX));

diff --git a/src/test/java/org/opensearch/ad/model/AnomalyDetectorTests.java b/src/test/java/org/opensearch/ad/model/AnomalyDetectorTests.java
@@ -994,7 +994,6 @@ public void testNullFixedValue() throws IOException {
                 null,
                 null,
                 null,
-                null,
                 null
             )
         );