Browse Source

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.
pull/8482/head
Daniel Nephin 4 years ago
parent
commit
8f596f5551
  1. 2
      agent/agent.go

2
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)
}

Loading…
Cancel
Save