Gian Merlino 8948c8d4ca Merge branch 'master' into event-push ...

Conflicts:
	client/src/main/java/com/metamx/druid/initialization/Initialization.java
	examples/src/main/java/druid/examples/twitter/TwitterSpritzerFirehoseFactory.java
	index-common/src/main/java/com/metamx/druid/indexer/data/StringInputRowParser.java
	merger/src/main/java/com/metamx/druid/merger/common/task/RealtimeIndexTask.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java
	merger/src/main/java/com/metamx/druid/merger/worker/executor/ExecutorNode.java

2013-05-02 16:34:14 +03:00

..

src/main/java/com/metamx/druid/realtime

Merge branch 'master' into event-push

2013-05-02 16:34:14 +03:00

pom.xml

1) Remove references to zkclient

2013-04-26 19:19:53 -05:00