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

..

bin

Merge branch 'master' into new-init

2014-08-08 12:44:29 -07:00

cassandra

first set of changes to standarize the naming convention we use in druid

2013-10-03 16:36:48 -07:00

config

Merge branch 'master' into druid-0.7.x

2014-08-12 14:00:21 -07:00

src

Merge branch 'master' into new-schema

2014-04-25 14:03:28 -07:00

pom.xml

[maven-release-plugin] prepare for next development iteration

2014-08-12 13:24:55 -07:00