Gian Merlino f862d9205d Merge branch 'master' into hadoop-index-task ... Conflicts: merger/src/main/java/com/metamx/druid/merger/common/task/Task.java		2013-02-27 06:53:06 -08:00
..
src	Merge branch 'master' into hadoop-index-task	2013-02-27 06:53:06 -08:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2013-02-26 15:15:54 -08:00