rebase master

pinterest · Feb 7, 2024 · 7294c18 · 7294c18
1 parent c5e9d2a
commit 7294c18
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/...ervice/teletraanservice/src/main/java/com/pinterest/teletraan/worker/DeployTagWorker.java b/...ervice/teletraanservice/src/main/java/com/pinterest/teletraan/worker/DeployTagWorker.java
@@ -22,8 +22,6 @@
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.Metrics;
 
-import java.util.concurrent.TimeUnit;
-
 public class DeployTagWorker implements Runnable {
     private static final Logger LOG = LoggerFactory.getLogger(DeployTagWorker.class);
     private static final int MAX_QUERY_TAGS_SIZE = 200;
@@ -92,10 +90,6 @@ private void processEachEnvironConstraint(DeployConstraintBean bean) throws Exce
         }
 
         // 2. add host tags from missing in db ( query for CMDB for the missing host tags )
-<<<<<<< HEAD
-=======
-        // For now we emit metrics to monitor
->>>>>>> emit metrics to monitor the tag creator
         if (!missings.isEmpty()) {
             List<UpdateStatement> statements = new ArrayList<>();