cheddar 5fa944dd26 Merge branch 'master' into guice ... Conflicts: client/src/main/java/com/metamx/druid/coordination/BatchDataSegmentAnnouncer.java client/src/main/java/com/metamx/druid/curator/announcement/Announcer.java client/src/main/java/com/metamx/druid/query/filter/SelectorDimFilter.java client/src/main/java/com/metamx/druid/query/search/SearchQueryQueryToolChest.java indexing-service/src/main/java/com/metamx/druid/indexing/common/tasklogs/S3TaskLogs.java indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/ForkingTaskRunner.java indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunner.java indexing-service/src/main/java/com/metamx/druid/indexing/worker/WorkerCuratorCoordinator.java indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunnerTest.java pom.xml server/src/main/java/com/metamx/druid/http/MasterMain.java server/src/main/java/com/metamx/druid/http/MasterServletModule.java server/src/main/java/com/metamx/druid/master/DruidMasterConfig.java server/src/test/java/com/metamx/druid/master/DruidMasterTest.java server/src/test/java/com/metamx/druid/query/group/GroupByQueryRunnerTest.java		2013-08-27 14:27:32 -05:00
..
ec2	port realtime to guice	2013-08-13 17:08:45 -07:00
examples	add wikipedia realtime example	2013-08-21 17:56:31 -07:00
run_ec2.sh	Fixed hanging ssh bug FINALLY	2013-07-09 18:41:06 -07:00
run_example_client.sh	1) Adjust the example code to all be in one repository.	2013-05-01 12:51:26 -05:00
run_example_server.sh	Merge branch 'master' into guice	2013-08-27 14:27:32 -05:00