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

..

bin

1) Broker works with Guice

2013-08-06 12:01:52 -07:00

cassandra

- Added cleanup to the puller.

2013-05-16 13:04:46 -04:00

config

Removed dupe numThreads value from configs, fiddling with run_ec2.sh/env.sh

2013-07-09 14:44:03 -07:00

src

Make it all compile again...

2013-08-02 10:14:46 -07:00

flights.spec

Move all the code for examples under the examples directory. Also add initial take on flights demo.

2013-04-30 18:27:38 -05:00

pom.xml

Merge branch 'master' into guice

2013-08-06 13:33:31 -07:00