kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 10:25:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9083 from hashicorp/b-fix-enterprise-config-merge

Browse Source 
agent: fix enterprise config overlay merging.
This commit is contained in:
James Rasell
2020-10-15 08:40:49 +02:00
committed by GitHub
parent afdf81bd0a d89b09c7e2
commit 1cfeeba9f2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
command/agent/command.go
View File

@@ -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)