Automatic merge from release/2.4.0 -> release/2.5.0

* commit '569e3d00946e58f03d0b386795ea1e612c0fc04a':
  解决冲突
This commit is contained in:
邱剑
2019-02-18 10:46:22 +08:00
+1 -1
View File
@@ -158,7 +158,7 @@ func (self *SStorage) AllowUpdateItem(ctx context.Context, userCred mcclient.Tok
}
func (self *SStorage) PostUpdate(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) {
self.SEnabledStatusStandaloneResourceBase.PostUpdate(ctx, userCred, query, data)
self.SStandaloneResourceBase.PostUpdate(ctx, userCred, query, data)
if data.Contains("cmtbound") {
hosts := self.GetAttachedHosts()