Gian Merlino f6752799bc Merge branch 'master' into realtime-index-task ...

Conflicts:
	merger/src/main/java/com/metamx/druid/merger/common/actions/SegmentInsertAction.java

2013-03-14 13:45:59 -07:00

..

src

Merge branch 'master' into realtime-index-task

2013-03-14 13:45:59 -07:00

pom.xml

[maven-release-plugin] prepare for next development iteration

2013-03-13 18:32:00 -05:00