fjy 469ccbbe5e Merge branch 'master' into druid-0.7.x ... Conflicts: cassandra-storage/pom.xml common/pom.xml examples/pom.xml hdfs-storage/pom.xml histogram/pom.xml indexing-hadoop/pom.xml indexing-service/pom.xml kafka-eight/pom.xml kafka-seven/pom.xml pom.xml processing/pom.xml processing/src/main/java/io/druid/query/FinalizeResultsQueryRunner.java processing/src/main/java/io/druid/query/UnionQueryRunner.java processing/src/main/java/io/druid/query/groupby/GroupByQueryRunnerFactory.java processing/src/main/java/io/druid/query/topn/TopNQueryEngine.java processing/src/main/java/io/druid/query/topn/TopNQueryRunnerFactory.java rabbitmq/pom.xml s3-extensions/pom.xml server/pom.xml server/src/test/java/io/druid/server/initialization/JettyTest.java services/pom.xml		2014-09-11 16:20:50 -07:00
..
src	Merge branch 'master' into druid-0.7.x	2014-09-11 16:20:50 -07:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2014-09-10 17:24:15 -07:00