Skip to content

Commit e7f544e

Browse files
committed
fix merge conflicts
Signed-off-by: Kaushal Kumar <[email protected]>
1 parent 11d027f commit e7f544e

37 files changed

+33
-85
lines changed

plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/WorkloadManagementPlugin.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
import org.opensearch.repositories.RepositoriesService;
4949
import org.opensearch.rest.RestController;
5050
import org.opensearch.rest.RestHandler;
51-
import org.opensearch.rule.rest.RestGetRuleAction;
5251
import org.opensearch.rule.service.IndexStoredRulePersistenceService;
5352
import org.opensearch.rule.storage.IndexBasedRuleQueryMapper;
5453
import org.opensearch.rule.storage.XContentRuleParser;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.plugin.wlm.querygroup.action;
9+
package org.opensearch.plugin.wlm.action;
1010

1111
import org.opensearch.action.ActionType;
1212

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.plugin.wlm.querygroup.action;
9+
package org.opensearch.plugin.wlm.action;
1010

1111
import org.opensearch.action.ActionRequestValidationException;
1212
import org.opensearch.action.support.clustermanager.ClusterManagerNodeRequest;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.plugin.wlm.querygroup.action;
9+
package org.opensearch.plugin.wlm.action;
1010

1111
import org.opensearch.cluster.metadata.WorkloadGroup;
1212
import org.opensearch.core.action.ActionResponse;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.plugin.wlm.querygroup.action;
9+
package org.opensearch.plugin.wlm.action;
1010

1111
import org.opensearch.action.ActionType;
1212
import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.plugin.wlm.querygroup.action;
9+
package org.opensearch.plugin.wlm.action;
1010

1111
import org.opensearch.action.ActionRequestValidationException;
1212
import org.opensearch.action.support.clustermanager.AcknowledgedRequest;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.plugin.wlm.querygroup.action;
9+
package org.opensearch.plugin.wlm.action;
1010

1111
import org.opensearch.action.ActionType;
1212

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.plugin.wlm.querygroup.action;
9+
package org.opensearch.plugin.wlm.action;
1010

1111
import org.opensearch.action.ActionRequestValidationException;
1212
import org.opensearch.action.support.clustermanager.ClusterManagerNodeReadRequest;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.plugin.wlm.querygroup.action;
9+
package org.opensearch.plugin.wlm.action;
1010

1111
import org.opensearch.cluster.metadata.WorkloadGroup;
1212
import org.opensearch.core.action.ActionResponse;
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.plugin.wlm.querygroup.action;
9+
package org.opensearch.plugin.wlm.action;
1010

1111
import org.opensearch.action.support.ActionFilters;
1212
import org.opensearch.action.support.clustermanager.TransportClusterManagerNodeAction;
@@ -17,11 +17,7 @@
1717
import org.opensearch.common.inject.Inject;
1818
import org.opensearch.core.action.ActionListener;
1919
import org.opensearch.core.common.io.stream.StreamInput;
20-
<<<<<<<< HEAD:plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/querygroup/action/TransportCreateWorkloadGroupAction.java
2120
import org.opensearch.plugin.wlm.service.WorkloadGroupPersistenceService;
22-
========
23-
import org.opensearch.plugin.wlm.querygroup.service.QueryGroupPersistenceService;
24-
>>>>>>>> eaf11b7f929 (add get rule api logic):plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/querygroup/action/TransportUpdateQueryGroupAction.java
2521
import org.opensearch.threadpool.ThreadPool;
2622
import org.opensearch.transport.TransportService;
2723

0 commit comments

Comments
 (0)