mirror of
https://github.com/apache/druid.git
synced 2025-02-11 04:24:58 +00:00
9e78bb38f5
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