From 0931e9e8100eb217a37eea764078b64a7f0013bb Mon Sep 17 00:00:00 2001 From: Laszlo Kiss Date: Sun, 24 Jan 2016 00:01:01 -0700 Subject: [PATCH] Revert "Added a straight forward merge of the maps of configuration objects." This reverts commit ea0dc3e3e0abe2a76007dfa3f09c933913240d2b. --- viper.go | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/viper.go b/viper.go index 5991198..0c5310c 100644 --- a/viper.go +++ b/viper.go @@ -950,18 +950,6 @@ func (v *Viper) MergeConfig(in io.Reader) error { return nil } -// Merge a configuration into another. -func Merge( other *Viper ) { v.Merge( other ) } -func (v *Viper) Merge( other *Viper ) { - mergeMaps( other.config, v.config, nil ) - mergeMaps( other.override, v.override, nil ) - mergeMaps( other.defaults, v.defaults, nil ) - mergeMaps( other.kvstore, v.kvstore, nil ) - for key,val := range other.pflags { v.pflags[key] = val } - for key,val := range other.env { v.env[key] = val } - for key,val := range other.aliases { v.aliases[key] = val } -} - func keyExists(k string, m map[string]interface{}) string { lk := strings.ToLower(k) for mk := range m {