diff options
| author | cpanato <ctadeu@gmail.com> | 2018-08-10 15:03:18 +0200 |
|---|---|---|
| committer | cpanato <ctadeu@gmail.com> | 2018-08-10 15:03:18 +0200 |
| commit | 620d55810db143b597cadc62f9210067e2589bb5 (patch) | |
| tree | db4ffd446218c94e38625d20e9fa0854e2f95603 /utils/config.go | |
| parent | d8c8a19d355fdd67a984fc696269521919bb58b5 (diff) | |
| parent | 4299ef312bfcafaa12546e929258a718ea19e9d7 (diff) | |
| download | chat-620d55810db143b597cadc62f9210067e2589bb5.tar.gz chat-620d55810db143b597cadc62f9210067e2589bb5.tar.bz2 chat-620d55810db143b597cadc62f9210067e2589bb5.zip | |
Merge remote-tracking branch 'upstream/release-5.2' into release-5.2-daily-merge-20180810
Diffstat (limited to 'utils/config.go')
| -rw-r--r-- | utils/config.go | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/utils/config.go b/utils/config.go index 4bbe4cd15..9e445bf5c 100644 --- a/utils/config.go +++ b/utils/config.go @@ -247,12 +247,6 @@ func ReadConfig(r io.Reader, allowEnvironmentOverrides bool) (*model.Config, map var config model.Config unmarshalErr := v.Unmarshal(&config) - if unmarshalErr == nil { - // https://github.com/spf13/viper/issues/324 - // https://github.com/spf13/viper/issues/348 - config.PluginSettings = model.PluginSettings{} - unmarshalErr = v.UnmarshalKey("pluginsettings", &config.PluginSettings) - } envConfig := v.EnvSettings() |