Merge branch 'master' of github.com:grafana/grafana

d69788c9 · Torkel Ödegaard · 69c2fafa · 620e3a60 · d69788c9
Commit d69788c9 authored Apr 28, 2016 by Torkel Ödegaard
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

pkg/services/sqlstore/plugin_setting.go
+0 -1

No files found.
--- a/pkg/services/sqlstore/plugin_setting.go
+++ b/pkg/services/sqlstore/plugin_setting.go
@@ -61,7 +61,6 @@ func UpdatePluginSetting(cmd *m.UpdatePluginSettingCmd) error {
 			for key, data := range cmd.SecureJsonData {
 				pluginSetting.SecureJsonData[key] = util.Encrypt([]byte(data), setting.SecretKey)
 			}
-			pluginSetting.SecureJsonData = cmd.GetEncryptedJsonData()
 			pluginSetting.Updated = time.Now()
 			pluginSetting.Enabled = cmd.Enabled
 			pluginSetting.JsonData = cmd.JsonData