fjy 7624bb5ea3 Merge branch 'master' into new-init ... Conflicts: examples/config/historical/runtime.properties examples/config/overlord/runtime.properties examples/config/realtime/runtime.properties processing/src/main/java/io/druid/guice/PropertiesModule.java server/src/main/java/io/druid/initialization/Initialization.java		2014-08-06 15:47:22 -07:00
..
main/java/io/druid	Merge branch 'master' into new-init	2014-08-06 15:47:22 -07:00
test	a few slight tweaks and bumping up curator version	2014-07-25 16:07:40 -07:00