Fangjin Yang 537f527960 Merge branch 'master' into stop_task ...

Conflicts:
	merger/src/test/java/com/metamx/druid/merger/coordinator/RemoteTaskRunnerTest.java

2013-03-26 14:14:23 -07:00

..

src/main/java/com/metamx/druid/realtime

RealtimePlumberSchool: Fix wait-for-handoff in finishJob

2013-03-24 18:23:17 -07:00

pom.xml

[maven-release-plugin] prepare for next development iteration

2013-03-26 11:10:15 -07:00