cheddar
|
eee1efdcb5
|
Merge branch 'master' into guice
Conflicts:
client/src/main/java/com/metamx/druid/client/DruidServerConfig.java
indexing-service/src/main/java/com/metamx/druid/indexing/common/index/ChatHandlerProvider.java
indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/TaskMasterLifecycle.java
indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorNode.java
indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskLifecycleTest.java
|
2013-08-06 13:33:31 -07:00 |
|
cheddar
|
3c808b15c3
|
1) Fix HadoopDruidIndexerConfigTest to actually verify the current correct behavior.
|
2013-08-05 11:37:20 -07:00 |
|
cheddar
|
2b71505421
|
1) Fix HadoopDruidIndexerConfig to no longer replace ":" with "_" on the segmentOutputDir. The segmentOutputDir is user-supplied so they should have the ability to just not set a bad directory.
|
2013-08-05 11:22:26 -07:00 |
|
cheddar
|
2361e0112a
|
Make it all compile again...
|
2013-08-02 10:14:46 -07:00 |
|
cheddar
|
9e78bb38f5
|
Merge branch 'master' into guice
Conflicts:
client/src/main/java/com/metamx/druid/QueryableNode.java
client/src/main/java/com/metamx/druid/client/ServerInventoryView.java
client/src/main/java/com/metamx/druid/coordination/SingleDataSegmentAnnouncer.java
client/src/main/java/com/metamx/druid/initialization/CuratorDiscoveryConfig.java
client/src/main/java/com/metamx/druid/query/MetricsEmittingExecutorService.java
indexing-hadoop/src/test/java/com/metamx/druid/indexer/HadoopDruidIndexerConfigTest.java
indexing-service/src/main/java/com/metamx/druid/indexing/common/TaskToolbox.java
indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/http/IndexerCoordinatorNode.java
indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorNode.java
indexing-service/src/main/java/com/metamx/druid/indexing/worker/http/WorkerNode.java
pom.xml
server/src/main/java/com/metamx/druid/coordination/ServerManager.java
server/src/main/java/com/metamx/druid/coordination/ZkCoordinator.java
server/src/main/java/com/metamx/druid/db/DatabaseRuleManager.java
server/src/main/java/com/metamx/druid/db/DatabaseSegmentManager.java
server/src/main/java/com/metamx/druid/http/ComputeNode.java
server/src/main/java/com/metamx/druid/http/MasterMain.java
server/src/main/java/com/metamx/druid/loading/SegmentLoaderConfig.java
server/src/main/java/com/metamx/druid/loading/SingleSegmentLoader.java
server/src/main/java/com/metamx/druid/master/DruidMaster.java
|
2013-08-01 16:42:47 -07:00 |
Jan Rudert
|
ad087a7a22
|
correct segment path for hadoop indexer
|
2013-07-10 09:21:45 +02:00 |
|
cheddar
|
2f56c24259
|
1) Inject IndexingServiceClient
2) Switch all the DBI references to IDBI
|
2013-06-07 17:37:33 -07:00 |
|
cheddar
|
f68df7ab69
|
1) Make tests work and continue trying to make the DruidMaster start up with just Guice
|
2013-06-07 12:01:46 -07:00 |
fjy
|
42cc87a294
|
Merge branch 'master' into refactor-indexing
Conflicts:
indexing-service/src/main/java/com/metamx/druid/indexing/common/task/IndexTask.java
pom.xml
|
2013-05-31 17:28:59 -07:00 |
|
fjy
|
08d84001ba
|
Merge branch 'master' into refactor-indexing
|
2013-05-16 16:03:29 -07:00 |
|
fjy
|
26e0eb62cb
|
merge and other refactorings
|
2013-05-15 17:28:08 -07:00 |