From 055e7e8ca370edb823e95587c498865d9183b199 Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Thu, 13 Aug 2020 11:28:26 -0400 Subject: [PATCH] Fix conflict in merged PRs One PR renamed the var from config->cfg, and another used the old name config, which caused the build to fail on master. --- agent/agent.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agent/agent.go b/agent/agent.go index 763500c55..78cb88336 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -510,7 +510,7 @@ func New(options ...AgentOption) (*Agent, error) { // Retrieve or generate the node ID before setting up the rest of the // agent, which depends on it. - config.NodeID, err = newNodeIDFromConfig(a.config, a.logger) + cfg.NodeID, err = newNodeIDFromConfig(a.config, a.logger) if err != nil { return nil, fmt.Errorf("failed to setup node ID: %w", err) }