From 7a0f634b02ffaba922125af1500317815bfca26f Mon Sep 17 00:00:00 2001 From: fjy Date: Thu, 2 Jan 2014 19:53:35 -0800 Subject: [PATCH 1/3] [maven-release-plugin] prepare release druid-0.6.47 --- cassandra-storage/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- hdfs-storage/pom.xml | 2 +- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 2 +- kafka-eight/pom.xml | 2 +- kafka-seven/pom.xml | 2 +- pom.xml | 4 ++-- processing/pom.xml | 2 +- rabbitmq/pom.xml | 2 +- s3-extensions/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cassandra-storage/pom.xml b/cassandra-storage/pom.xml index 57ad7d79e58..11df3044402 100644 --- a/cassandra-storage/pom.xml +++ b/cassandra-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.47-SNAPSHOT + 0.6.47 diff --git a/common/pom.xml b/common/pom.xml index b46929f30d2..f34e0e0c4f9 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.47-SNAPSHOT + 0.6.47 diff --git a/examples/pom.xml b/examples/pom.xml index 0ec8f06142c..e50f20c7bc8 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.47-SNAPSHOT + 0.6.47 diff --git a/hdfs-storage/pom.xml b/hdfs-storage/pom.xml index 3d6343c7183..5a166243dbe 100644 --- a/hdfs-storage/pom.xml +++ b/hdfs-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.47-SNAPSHOT + 0.6.47 diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 1562f24a5e5..12809f18fa7 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.47-SNAPSHOT + 0.6.47 diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 82166796035..9d7b00c4b09 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.47-SNAPSHOT + 0.6.47 diff --git a/kafka-eight/pom.xml b/kafka-eight/pom.xml index e378ffa75ef..32fd007f85d 100644 --- a/kafka-eight/pom.xml +++ b/kafka-eight/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.47-SNAPSHOT + 0.6.47 diff --git a/kafka-seven/pom.xml b/kafka-seven/pom.xml index acc488d3c26..b8dc53b56b6 100644 --- a/kafka-seven/pom.xml +++ b/kafka-seven/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.47-SNAPSHOT + 0.6.47 diff --git a/pom.xml b/pom.xml index 2756303acef..8797b20e38f 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,14 @@ io.druid druid pom - 0.6.47-SNAPSHOT + 0.6.47 druid druid scm:git:ssh://git@github.com/metamx/druid.git scm:git:ssh://git@github.com/metamx/druid.git http://www.github.com/metamx/druid - ${project.artifactId}-${project.version} + druid-0.6.47 diff --git a/processing/pom.xml b/processing/pom.xml index 21f35318569..72abbea3bda 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.47-SNAPSHOT + 0.6.47 diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml index bf9653b5fb1..ea1662429a2 100644 --- a/rabbitmq/pom.xml +++ b/rabbitmq/pom.xml @@ -9,7 +9,7 @@ io.druid druid - 0.6.47-SNAPSHOT + 0.6.47 diff --git a/s3-extensions/pom.xml b/s3-extensions/pom.xml index 5880eea1657..7160faecf6f 100644 --- a/s3-extensions/pom.xml +++ b/s3-extensions/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.47-SNAPSHOT + 0.6.47 diff --git a/server/pom.xml b/server/pom.xml index eda8a93fcb4..9bcbf4947a3 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.47-SNAPSHOT + 0.6.47 diff --git a/services/pom.xml b/services/pom.xml index 4c462e95139..af2b14433fe 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.47-SNAPSHOT + 0.6.47 From 2b46c1d29206e54dd40a1da9ce44b2c90898509e Mon Sep 17 00:00:00 2001 From: fjy Date: Thu, 2 Jan 2014 19:53:41 -0800 Subject: [PATCH 2/3] [maven-release-plugin] prepare for next development iteration --- cassandra-storage/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- hdfs-storage/pom.xml | 2 +- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 2 +- kafka-eight/pom.xml | 2 +- kafka-seven/pom.xml | 2 +- pom.xml | 4 ++-- processing/pom.xml | 2 +- rabbitmq/pom.xml | 2 +- s3-extensions/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cassandra-storage/pom.xml b/cassandra-storage/pom.xml index 11df3044402..c56617fc659 100644 --- a/cassandra-storage/pom.xml +++ b/cassandra-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.47 + 0.6.48-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index f34e0e0c4f9..9b732f714ee 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.47 + 0.6.48-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index e50f20c7bc8..0e4f56ca1e8 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.47 + 0.6.48-SNAPSHOT diff --git a/hdfs-storage/pom.xml b/hdfs-storage/pom.xml index 5a166243dbe..a59524271d5 100644 --- a/hdfs-storage/pom.xml +++ b/hdfs-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.47 + 0.6.48-SNAPSHOT diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 12809f18fa7..38d032fadba 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.47 + 0.6.48-SNAPSHOT diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 9d7b00c4b09..e8cfbdf8fa1 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.47 + 0.6.48-SNAPSHOT diff --git a/kafka-eight/pom.xml b/kafka-eight/pom.xml index 32fd007f85d..79d053ad355 100644 --- a/kafka-eight/pom.xml +++ b/kafka-eight/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.47 + 0.6.48-SNAPSHOT diff --git a/kafka-seven/pom.xml b/kafka-seven/pom.xml index b8dc53b56b6..e2922e97e3c 100644 --- a/kafka-seven/pom.xml +++ b/kafka-seven/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.47 + 0.6.48-SNAPSHOT diff --git a/pom.xml b/pom.xml index 8797b20e38f..3d082a9cf93 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,14 @@ io.druid druid pom - 0.6.47 + 0.6.48-SNAPSHOT druid druid scm:git:ssh://git@github.com/metamx/druid.git scm:git:ssh://git@github.com/metamx/druid.git http://www.github.com/metamx/druid - druid-0.6.47 + ${project.artifactId}-${project.version} diff --git a/processing/pom.xml b/processing/pom.xml index 72abbea3bda..7b5cd091eb1 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.47 + 0.6.48-SNAPSHOT diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml index ea1662429a2..e72c0aa9100 100644 --- a/rabbitmq/pom.xml +++ b/rabbitmq/pom.xml @@ -9,7 +9,7 @@ io.druid druid - 0.6.47 + 0.6.48-SNAPSHOT diff --git a/s3-extensions/pom.xml b/s3-extensions/pom.xml index 7160faecf6f..11c189ad9b2 100644 --- a/s3-extensions/pom.xml +++ b/s3-extensions/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.47 + 0.6.48-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index 9bcbf4947a3..a354a0728ed 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.47 + 0.6.48-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index af2b14433fe..fba4cc40f45 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.47 + 0.6.48-SNAPSHOT From 3544b7ec4ae1e1a9d914fc6da25ce91231377c65 Mon Sep 17 00:00:00 2001 From: fjy Date: Mon, 6 Jan 2014 09:31:04 -0800 Subject: [PATCH 3/3] Fixes #346 --- .../java/io/druid/segment/realtime/RealtimeMetricsMonitor.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/src/main/java/io/druid/segment/realtime/RealtimeMetricsMonitor.java b/server/src/main/java/io/druid/segment/realtime/RealtimeMetricsMonitor.java index 246654ffd8f..5714e98cf62 100644 --- a/server/src/main/java/io/druid/segment/realtime/RealtimeMetricsMonitor.java +++ b/server/src/main/java/io/druid/segment/realtime/RealtimeMetricsMonitor.java @@ -20,6 +20,7 @@ package io.druid.segment.realtime; import com.google.common.collect.Maps; +import com.google.inject.Inject; import com.metamx.emitter.service.ServiceEmitter; import com.metamx.emitter.service.ServiceMetricEvent; import com.metamx.metrics.AbstractMonitor; @@ -34,6 +35,7 @@ public class RealtimeMetricsMonitor extends AbstractMonitor private final Map previousValues; private final List fireDepartments; + @Inject public RealtimeMetricsMonitor(List fireDepartments) { this.fireDepartments = fireDepartments;