Gian Merlino 9b9a2a9f53 Merge branch 'master' into num-shard-spec ... Conflicts: common/src/main/java/com/metamx/druid/partition/IntegerPartitionChunk.java		2013-08-21 15:01:46 -07:00
..
src	Merge branch 'master' into num-shard-spec	2013-08-21 15:01:46 -07:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2013-08-20 19:37:52 -07:00