upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-06-04 22:32:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Update cluster name during config merge

Browse source
This commit is contained in:
vishalnayak 2016-07-26 11:11:12 -04:00
parent e5c61509d6
commit 46b94d8612
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
command/server/config.go
View file

@ -212,6 +212,11 @@ func (c *Config) Merge(c2 *Config) *Config {
result.DefaultLeaseTTL = c2.DefaultLeaseTTL
}
result.ClusterName = c.ClusterName
if c2.ClusterName != "" {
result.ClusterName = c2.ClusterName
}
return result
}