upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-05-28 04:10:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge HA Backend objects

Browse source
This commit is contained in:
Jeff Mitchell 2016-03-21 16:56:13 -04:00
parent b12747d6c0
commit c22fc374b6
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

@ -110,6 +110,11 @@ func (c *Config) Merge(c2 *Config) *Config {
result.Backend = c2.Backend
}
result.HABackend = c.HABackend
if c2.HABackend != nil {
result.HABackend = c2.HABackend
}
result.Telemetry = c.Telemetry
if c2.Telemetry != nil {
result.Telemetry = c2.Telemetry