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

This commit is contained in:
Yousong Zhou
2019-03-13 13:33:51 +00:00
402 changed files with 545 additions and 225 deletions

View File

@@ -7,10 +7,11 @@ import (
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/pkg/utils"
"yunion.io/x/onecloud/pkg/cloudprovider"
"yunion.io/x/onecloud/pkg/compute/models"
"yunion.io/x/onecloud/pkg/util/billing"
"yunion.io/x/pkg/utils"
)
const (