fix merge conflict

Signed-off-by: Rahul Karajgikar <[email protected]>
opensearch-project · Sep 4, 2024 · d7be8b7 · d7be8b7
1 parent 93e44e4
commit d7be8b7
Showing 1 changed file with 0 additions and 14 deletions.
diff --git a/server/src/main/java/org/opensearch/cluster/coordination/PublicationTransportHandler.java b/server/src/main/java/org/opensearch/cluster/coordination/PublicationTransportHandler.java
@@ -499,21 +499,7 @@ public void onFailure(Exception e) {
             } else {
                 responseActionListener = listener;
             }
-<<<<<<< HEAD
             sendClusterState(destination, responseActionListener);
-=======
-            // TODO Decide to send remote state before starting publication by checking remote publication on all nodes
-            if (sendRemoteState && destination.isRemoteStatePublicationEnabled()) {
-                logger.trace("sending remote cluster state version [{}] to [{}]", newState.version(), destination);
-                sendRemoteClusterState(destination, publishRequest.getAcceptedState(), responseActionListener);
-            } else if (sendFullVersion || previousState.nodes().nodeExists(destination) == false) {
-                logger.trace("sending full cluster state version [{}] to [{}]", newState.version(), destination);
-                sendFullClusterState(destination, responseActionListener);
-            } else {
-                logger.trace("sending cluster state diff for version [{}] to [{}]", newState.version(), destination);
-                sendClusterStateDiff(destination, responseActionListener);
-            }
->>>>>>> f0cf40ce03f (cleanup unused code and remove added log lines)
         }
 
         public void sendApplyCommit(