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 |
Russell Jurney
|
1669e46338
|
Fixing bug where twitter example does not run.
|
2013-08-22 19:48:21 -07:00 |
fjy
|
85ee8bb267
|
port realtime to guice
|
2013-08-13 17:08:45 -07:00 |
|
cheddar
|
c4a3a9b2fc
|
1) Fix scripts to run the examples from a fresh build
|
2013-06-10 11:53:57 -07:00 |
Steve Harris
|
cfe9b7f177
|
Added a few comments and made sure it still works for non-kits
|
2013-05-04 21:02:31 -07:00 |
|
Steve Harris
|
c0e38981ff
|
Forgot to edit the source file so config was messed up
|
2013-05-04 20:50:53 -07:00 |
|
Steve Harris
|
5a9bf98b6c
|
Some changes to automatically build a kit with samples.
|
2013-05-04 20:04:16 -07: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 |