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
..
src	Merge branch 'master' into new-init	2014-08-06 15:47:22 -07:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2014-08-06 13:34:04 -07:00