opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.3.0 -> release/2.4.0

Browse Source 
* commit '379e0ac7bc6f64d0a9679cc4998d0abfd68af156':
  删除安全组后先隐藏后删除
This commit is contained in:
邱剑
2019-02-11 20:43:38 +08:00
parent e80ce6369e 379e0ac7bc
commit 6f933566da
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/secgroups.go
+1 -2
View File
@@ -456,8 +456,7 @@ func (self *SSecurityGroup) StartDeleteSecurityGroupTask(ctx context.Context, us
}
func (self *SSecurityGroup) Delete(ctx context.Context, userCred mcclient.TokenCredential) error {
log.Infof("SecurityGroup delete do nothing")
return nil
return self.SSharableVirtualResourceBase.DoPendingDelete(ctx, userCred)
}
func (self *SSecurityGroup) RealDelete(ctx context.Context, userCred mcclient.TokenCredential) error {