Fangjin Yang bab9ee8827 Merge branch 'master' into killsegments ...

Conflicts:
	merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java

2013-01-21 14:47:49 -08:00

..

src

Merge branch 'master' into killsegments

2013-01-21 14:47:49 -08:00

pom.xml

fix pom breakage

2013-01-15 12:04:12 -08:00