fjy a63cda3281 Merge branch 'master' into new-guava ...

Conflicts:
	server/src/main/java/io/druid/server/QueryResource.java

2014-06-13 10:08:10 -07:00

..

src

update guava, java-util, and druid-api

2014-06-03 13:43:38 -07:00

pom.xml

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

2014-06-05 10:03:31 -07:00