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
..