Xavier Léauté 508e982190 Merge remote-tracking branch 'origin/master' into druid-0.7.x ... Conflicts: cassandra-storage/pom.xml common/pom.xml examples/config/historical/runtime.properties examples/config/overlord/runtime.properties examples/config/realtime/runtime.properties 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 rabbitmq/pom.xml s3-extensions/pom.xml server/pom.xml server/src/main/java/io/druid/server/ClientQuerySegmentWalker.java services/pom.xml		2014-08-30 22:42:36 -07:00
..
src	Merge remote-tracking branch 'origin/master' into druid-0.7.x	2014-08-30 22:42:36 -07:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2014-08-29 15:29:58 -07:00