fjy 41ebdd2bae Merge branch 'druid-0.7.x' into fix-test ... Conflicts: processing/pom.xml processing/src/main/java/io/druid/segment/IndexMerger.java processing/src/main/java/io/druid/segment/MetricHolder.java processing/src/main/java/io/druid/segment/data/CompressedObjectStrategy.java processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerTest.java processing/src/test/java/io/druid/segment/SchemalessTestFull.java server/src/test/java/io/druid/client/CachingClusteredClientTest.java services/src/main/java/io/druid/cli/CliHistorical.java		2014-10-24 11:07:52 -07:00
..
src	Merge branch 'druid-0.7.x' into fix-test	2014-10-24 11:07:52 -07:00
pom.xml	merge with 0.7.x and resolve any conflicts	2014-10-23 17:24:06 -07:00