lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-07-01 01:36:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.5.0 -> release/2.6.0

Browse Source 
* commit '8dacd50d0e7c995d7d4927f3c90a54046d1e52a8':
  修复2.5未自动合并2.4代码更改
This commit is contained in:
邱剑
2019-03-11 18:28:42 +08:00
parent 39af7f16b5 8dacd50d0e
commit 99e2c939a5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/compute/models/guest_actions.go
View File

@@ -2794,7 +2794,7 @@ func (self *SGuest) importDisks(ctx context.Context, userCred mcclient.TokenCred
return httperrors.NewInputParameterError("Empty import disks")
}
for _, disk := range disks {
disk, err := self.createDiskOnHost(ctx, userCred, self.GetHost(), disk.ToDiskConfig(), nil, true)
disk, err := self.createDiskOnHost(ctx, userCred, self.GetHost(), disk.ToDiskConfig(), nil, true, true)
if err != nil {
return err
}