mirror of
https://github.com/apache/druid.git
synced 2025-02-14 22:15:11 +00:00
d7f9b829ac
Merge branch 'guice' of github.com:metamx/druid into guice Conflicts: client/src/main/java/com/metamx/druid/curator/discovery/DiscoveryModule.java client/src/main/java/com/metamx/druid/initialization/CuratorDiscoveryConfig.java client/src/main/java/com/metamx/druid/initialization/DruidNodeConfig.java client/src/main/java/com/metamx/druid/initialization/EmitterModule.java client/src/main/java/com/metamx/druid/initialization/HttpEmitterConfig.java client/src/main/java/com/metamx/druid/initialization/HttpEmitterModule.java client/src/main/java/com/metamx/druid/initialization/LogEmitterModule.java client/src/main/java/com/metamx/druid/initialization/ServiceDiscoveryConfig.java common/pom.xml common/src/main/java/com/metamx/druid/db/DbConnector.java common/src/main/java/com/metamx/druid/db/DbTablesConfig.java common/src/main/java/com/metamx/druid/guice/ConfigProvider.java common/src/main/java/com/metamx/druid/guice/DruidSecondaryModule.java common/src/main/java/com/metamx/druid/guice/JsonConfigProvider.java common/src/main/java/com/metamx/druid/guice/LifecycleModule.java common/src/main/java/com/metamx/druid/guice/LifecycleScope.java indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/TaskMasterLifecycle.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/db/DatabaseRuleManager.java server/src/main/java/com/metamx/druid/db/DatabaseRuleManagerConfig.java server/src/main/java/com/metamx/druid/db/DatabaseSegmentManager.java server/src/main/java/com/metamx/druid/db/DatabaseSegmentManagerConfig.java server/src/main/java/com/metamx/druid/guice/MasterModule.java server/src/main/java/com/metamx/druid/http/MasterMain.java server/src/main/java/com/metamx/druid/loading/cassandra/CassandraDataSegmentConfig.java server/src/main/java/com/metamx/druid/metrics/MetricsModule.java
See the "Wiki" https://github.com/metamx/druid/wiki Build with build.sh See examples/rand See examples/twitter