mirror of https://github.com/apache/druid.git
fix merge break
This commit is contained in:
parent
b1b611735e
commit
a5c3eab2f1
|
@ -221,7 +221,7 @@ public class BrokerNode extends BaseNode<BrokerNode>
|
||||||
|
|
||||||
final ServiceDiscoveryConfig serviceDiscoveryConfig = getConfigFactory().build(ServiceDiscoveryConfig.class);
|
final ServiceDiscoveryConfig serviceDiscoveryConfig = getConfigFactory().build(ServiceDiscoveryConfig.class);
|
||||||
CuratorFramework curatorFramework = Initialization.makeCuratorFrameworkClient(
|
CuratorFramework curatorFramework = Initialization.makeCuratorFrameworkClient(
|
||||||
serviceDiscoveryConfig.getZkHosts(), lifecycle
|
serviceDiscoveryConfig, lifecycle
|
||||||
);
|
);
|
||||||
|
|
||||||
final ServiceDiscovery serviceDiscovery = Initialization.makeServiceDiscoveryClient(
|
final ServiceDiscovery serviceDiscovery = Initialization.makeServiceDiscoveryClient(
|
||||||
|
|
Loading…
Reference in New Issue