Skip to content
This repository has been archived by the owner on Nov 9, 2020. It is now read-only.

Commit

Permalink
Resolve conflicts, retrigger CI.
Browse files Browse the repository at this point in the history
  • Loading branch information
Miao Luo committed Oct 31, 2017
1 parent 0bdf110 commit d021b5a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion client_plugin/drivers/vfile/kvstore/etcdops/etcdops.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit d021b5a

Please sign in to comment.