scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-02 03:27:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't panic on an empty configuration during merge

Browse Source
This commit is contained in:
Jeff Mitchell
2016-07-05 16:49:15 -04:00
parent 50e44b750d
commit 6bdda578ac
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
command/server/config.go
View File

@@ -97,6 +97,10 @@ func (s *Telemetry) GoString() string {
// Merge merges two configurations.
func (c *Config) Merge(c2 *Config) *Config {
if c2 == nil {
return c
}
result := new(Config)
for _, l := range c.Listeners {
result.Listeners = append(result.Listeners, l)