druid/merger
Eric Tschetter d1ffe93c5a Merge remote branch 'origin/convert_task' into convert_task
Conflicts:
	merger/src/main/java/com/metamx/druid/merger/coordinator/TaskMasterLifecycle.java
2013-03-07 18:12:31 -06:00
..
src Merge remote branch 'origin/convert_task' into convert_task 2013-03-07 18:12:31 -06:00
pom.xml [maven-release-plugin] prepare for next development iteration 2013-03-05 13:30:49 -06:00