[HWKMETRICS-199] fix rebase errors

Conflicts: api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/MetricsServiceLifecycle.java task-queue/src/test/java/org/hawkular/metrics/tasks/impl/TaskSchedulerITest.java
hawkular · Aug 11, 2015 · 4c2eb57 · 4c2eb57
1 parent 7f45b87
commit 4c2eb57
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/task-queue/src/main/java/org/hawkular/metrics/tasks/impl/TaskSchedulerImpl.java b/task-queue/src/main/java/org/hawkular/metrics/tasks/impl/TaskSchedulerImpl.java
@@ -196,6 +196,11 @@ public Observable<Long> getFinishedTimeSlices() {
         return tickSubject;
     }
 
+    @Override
+    public boolean isRunning() {
+        return running;
+    }
+
     public Observable<Task2> getTasks() {
         return taskSubject;
     }