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

Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190215

Browse Source 
Conflicts:
	pkg/compute/guestdrivers/esxi.go
	pkg/compute/guestdrivers/openstack.go
This commit is contained in:
Qiu Jian
2019-02-15 19:47:56 +08:00
parent 38d22259a7 3731a28a3a
commit f2e97ff272
20 changed files with 151 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/standalone.go
+3
View File
@@ -131,6 +131,9 @@ func (model *SStandaloneResourceBase) GetShortDesc(ctx context.Context) *jsonuti
desc := model.SResourceBase.GetShortDesc(ctx)
desc.Add(jsonutils.NewString(model.GetName()), "name")
desc.Add(jsonutils.NewString(model.GetId()), "id")
if len(model.ExternalId) > 0 {
desc.Add(jsonutils.NewString(model.ExternalId), "external_id")
}
return desc
}
pkg/cloudcommon/options.go
+1 -1
View File
@@ -56,7 +56,7 @@ type DBOptions struct {
AutoSyncTable bool `help:"Automatically synchronize table changes if differences are detected"`
GlobalVirtualResourceNamespace bool `help:"Per project namespace or global namespace for virtual resources"`
DebugSqlchemy bool `default:"False" help:"Print SQL executed by sqlchemy"`
DebugSqlchemy bool `default:"false" help:"Print SQL executed by sqlchemy"`
}
func (this *DBOptions) GetDBConnection() (dialect, connstr string, err error) {