fjy 42cc87a294 Merge branch 'master' into refactor-indexing ... Conflicts: indexing-service/src/main/java/com/metamx/druid/indexing/common/task/IndexTask.java pom.xml		2013-05-31 17:28:59 -07:00
..
main/java/com/metamx/druid/indexer	Merge branch 'master' into refactor-indexing	2013-05-31 17:28:59 -07:00
test/java/com/metamx/druid/indexer	merge and other refactorings	2013-05-15 17:28:08 -07:00