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

Merge remote-tracking branch 'origin/release/2.6.0' into bugfix/yousong-goimports-270

Browse Source
This commit is contained in:
Yousong Zhou
2019-03-13 13:33:51 +00:00
parent 6a5923693f 223c9f6461
commit 4c82dae39b
402 changed files with 545 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/image/models/initdb.go
+1
View File
@@ -2,6 +2,7 @@ package models
import (
"yunion.io/x/log"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
)
pkg/image/service/service.go
+1 -2
View File
@@ -9,13 +9,12 @@ import (
"yunion.io/x/log"
_ "yunion.io/x/onecloud/pkg/image/tasks"
"yunion.io/x/onecloud/pkg/cloudcommon"
"yunion.io/x/onecloud/pkg/cloudcommon/cronman"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
"yunion.io/x/onecloud/pkg/image/models"
"yunion.io/x/onecloud/pkg/image/options"
_ "yunion.io/x/onecloud/pkg/image/tasks"
"yunion.io/x/onecloud/pkg/image/torrent"
"yunion.io/x/onecloud/pkg/util/fileutils2"
)
pkg/image/tasks/image_delete_task.go
+1
View File
@@ -3,6 +3,7 @@ package tasks
import (
"context"
"fmt"
"yunion.io/x/jsonutils"
"yunion.io/x/log"