Gian Merlino 77a3f3cbe0 Merge branch 'master' into determine-partitions ... Conflicts: indexer/src/main/java/com/metamx/druid/indexer/IndexGeneratorJob.java		2013-01-21 14:46:13 -08:00
..
src	Merge branch 'master' into determine-partitions	2013-01-21 14:46:13 -08:00
pom.xml	fix pom breakage	2013-01-15 12:04:12 -08:00