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

torkelo · torkelo · commit d69788c9dff4 · 2016-04-28T15:30:09.000+02:00
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,6 @@ func UpdatePluginSetting(cmd *m.UpdatePluginSettingCmd) error {`
`61`	`61`	`for key, data := range cmd.SecureJsonData {`
`62`	`62`	`pluginSetting.SecureJsonData[key] = util.Encrypt([]byte(data), setting.SecretKey)`
`63`	`63`	`}`
`64`		`- pluginSetting.SecureJsonData = cmd.GetEncryptedJsonData()`
`65`	`64`	`pluginSetting.Updated = time.Now()`
`66`	`65`	`pluginSetting.Enabled = cmd.Enabled`
`67`	`66`	`pluginSetting.JsonData = cmd.JsonData`