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

Merge branch 'master' into new-guava

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

pom.xml

Merge pull request #569 from tucksaun/fix-build-as-submodule

2014-06-11 12:17:45 -07:00