Skip to content

Commit

Permalink
Merge pull request #9083 from hashicorp/b-fix-enterprise-config-merge
Browse files Browse the repository at this point in the history
agent: fix enterprise config overlay merging.
  • Loading branch information
jrasell committed Oct 15, 2020
2 parents afdf81b + d89b09c commit 1cfeeba
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion command/agent/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ func (c *Command) readConfig() *Config {
}

// Merge in the enterprise overlay
config.Merge(DefaultEntConfig())
config = config.Merge(DefaultEntConfig())

for _, path := range configPath {
current, err := LoadConfig(path)
Expand Down

0 comments on commit 1cfeeba

Please sign in to comment.