Resolve conflicts.

vmware-archive · Oct 30, 2017 · 42c40e1 · 42c40e1
1 parent 6443028
commit 42c40e1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/client_plugin/drivers/vfile/kvstore/etcdops/etcdops.go b/client_plugin/drivers/vfile/kvstore/etcdops/etcdops.go
@@ -195,7 +195,7 @@ func (e *EtcdKVS) startEtcdCluster() error {
 func (e *EtcdKVS) joinEtcdCluster() error {
 	nodeAddr := e.nodeAddr
 	nodeID := e.nodeID
-	log.Infof("joinEtcdCluster on node with nodeID %s and nodeAddr %s leaderAddr %s", nodeID, nodeAddr, leaderAddr)
+	log.Infof("joinEtcdCluster on node with nodeID %s and nodeAddr %s", nodeID, nodeAddr)
 
 	leaderAddr, err := e.dockerOps.GetSwarmLeader()
 	if err != nil {