[HWKMETRICS-200] fix merge conflicts

hawkular · Aug 12, 2015 · 9076871 · 9076871
1 parent 15dcbd0
commit 9076871
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccessImpl.java b/core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccessImpl.java
@@ -21,6 +21,8 @@
 import static org.hawkular.metrics.core.api.MetricType.COUNTER;
 import static org.hawkular.metrics.core.impl.TimeUUIDUtils.getTimeUUID;
 
+import static com.datastax.driver.core.BatchStatement.Type.UNLOGGED;
+
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.Map;

diff --git a/core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsServiceITest.java b/core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsServiceITest.java
@@ -157,8 +157,7 @@ public void createTenants() throws Exception {
         assertDataRetentionsIndexMatches(t1.getId(), GAUGE, ImmutableSet.of(new Retention(
                 new MetricId(t1.getId(), GAUGE, makeSafe(GAUGE.getText())), 1)));
         assertDataRetentionsIndexMatches(t1.getId(), AVAILABILITY, ImmutableSet.of(new Retention(
-                new MetricId(t1.getId(), AVAILABILITY, "[" + AVAILABILITY.getText() + "]"),
-                hours(24).toStandardSeconds().getSeconds())));
+                new MetricId(t1.getId(), AVAILABILITY, makeSafe(AVAILABILITY.getText())), 1)));
     }
 
     @Test