Commit Graph

60 Commits

Author SHA1 Message Date
fjy e242baacf4 Merge branch 'master' into batch-zk 2013-06-20 16:21:33 -07:00
Dhruv Parthasarathy 748695bf97 trying to recover my files on intellij 2013-06-20 14:59:52 -07:00
fjy caa68e101a first commit; things working right now 2013-06-19 15:56:45 -07:00
Russell Jurney 58780094a9 Upgraded to twitter4j 3.0.3, twitter example now works with twitter4j.properties in place that lists key pairs. 2013-06-13 17:59:17 -07:00
Brian O'Neill 10a96626d4 Documentation for C* 2013-05-07 16:53:12 -04:00
Brian O'Neill 863b8808cc Merge branch 'master' of https://github.com/metamx/druid into cassandra-segments 2013-05-07 11:36:49 -04:00
Brian O'Neill 79d802fede Working data segment pushed for C*. 2013-05-06 17:54:12 -04:00
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
cheddar e1a2c43baf 1) Adjust the example code to all be in one repository.
2) Adjust the run scripts to be able to switch between different examples.
2013-05-01 12:51:26 -05:00
cheddar 0a3492c9f5 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