1. 30 8月, 2013 13 次提交
  2. 29 8月, 2013 6 次提交
  3. 28 8月, 2013 5 次提交
    • C
    • C
      1) Make it compile again after the merge · ee1e73cf
      cheddar 提交于
      ee1e73cf
    • C
      8097450d
    • C
      Merge branch 'master' into guice · 5fa944dd
      cheddar 提交于
      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
      5fa944dd
    • C
      3617ac17
  4. 27 8月, 2013 2 次提交
  5. 24 8月, 2013 7 次提交
  6. 23 8月, 2013 7 次提交