Fangjin Yang b1b611735e Merge branch 'master' into autoscaling ... Conflicts: client/src/main/java/com/metamx/druid/http/BrokerMain.java merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerNode.java		2012-11-02 15:57:16 -07:00
..
src/main/java/com/metamx/druid/realtime	Merge branch 'master' into autoscaling	2012-11-02 15:57:16 -07:00
pom.xml	Cleaned Maven dependency configuration. In particular the 'mvn dependency:analyze' report no longer warns of used but undeclared dependencies.	2012-10-31 16:10:07 -07:00