fjy 46b9ac78e7 Merge branch 'master' into new-schema ...

Conflicts:
	indexing-hadoop/src/test/java/io/druid/indexer/HadoopDruidIndexerConfigTest.java
	pom.xml
	publications/whitepaper/druid.pdf
	publications/whitepaper/druid.tex

2014-03-03 14:48:15 -08:00

..

src

Merge branch 'master' into new-schema

2014-03-03 14:48:15 -08:00

pom.xml

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

2014-02-27 11:52:40 -08:00