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

..

assembly

clean up poms, add a new loading your own data tutorial, add new validation, clean up logs

2013-10-09 15:42:39 -07:00

bin

1) druid-services -> services

2013-05-01 17:37:38 -05:00

main/java/io/druid

Merge branch 'master' into new-guava

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