Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This conflict merge thing is really weird... 

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
This commit is contained in:
cheddar 2013-07-17 09:50:14 -07:00
parent e892d14f77 75a464abe2
commit d7f9b829ac
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/main/java/com/metamx/druid/initialization/CuratorDiscoveryConfig.java
View File

@ -21,14 +21,11 @@ package com.metamx.druid.initialization;
import com.fasterxml.jackson.annotation.JsonProperty;
import javax.validation.constraints.NotNull;
/**
*/
public class CuratorDiscoveryConfig
public abstract class CuratorDiscoveryConfig
{
@JsonProperty
@NotNull
private String path = null;
public String getPath()