Fix merge issues due to rebase wintermute.

hawkular · Mar 17, 2015 · 4d205b7 · 4d205b7
1 parent 174dfc8
commit 4d205b7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionsHandler.java b/hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionsHandler.java
@@ -16,6 +16,9 @@
  */
 package org.hawkular.alerts.rest;
 
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
+
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;

diff --git a/hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java b/hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java
@@ -38,6 +38,7 @@
 import javax.ws.rs.container.Suspended;
 import javax.ws.rs.core.Response;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.wordnik.swagger.annotations.Api;
 import com.wordnik.swagger.annotations.ApiOperation;
 import com.wordnik.swagger.annotations.ApiParam;