Xavier Léauté 161c2f0fff Merge branch '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 services/pom.xml		2014-08-12 14:00:21 -07:00
..
runtime.properties	Merge branch 'master' into druid-0.7.x	2014-08-12 14:00:21 -07:00