Fangjin Yang 69b929fad5 Merge branch 'master' into moarunittests ...

Conflicts:
	merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/TaskInventoryManager.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java
	merger/src/main/java/com/metamx/druid/merger/worker/Worker.java
	merger/src/main/java/com/metamx/druid/merger/worker/WorkerCuratorCoordinator.java

2012-11-01 16:41:13 -07:00

..

src

Merge branch 'master' into moarunittests

2012-11-01 16:41:13 -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