mirror of
https://github.com/apache/druid.git
synced 2025-02-09 19:44:57 +00:00
49700dffe9
Conflicts: merger/src/main/java/com/metamx/druid/merger/common/TaskToolbox.java merger/src/main/java/com/metamx/druid/merger/common/task/DeleteTask.java merger/src/main/java/com/metamx/druid/merger/common/task/IndexGeneratorTask.java merger/src/main/java/com/metamx/druid/merger/common/task/MergeTask.java merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerNode.java