cheddar eee1efdcb5 Merge branch 'master' into guice ... Conflicts: client/src/main/java/com/metamx/druid/client/DruidServerConfig.java indexing-service/src/main/java/com/metamx/druid/indexing/common/index/ChatHandlerProvider.java indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/TaskMasterLifecycle.java indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorNode.java indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskLifecycleTest.java		2013-08-06 13:33:31 -07:00
..
src	1) Rename QueryToolChestModule back	2013-08-06 12:05:56 -07:00
pom.xml	Merge branch 'master' into guice	2013-08-06 13:33:31 -07:00