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 pull request #424 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-minors-2.0 to release/2.0.0

Browse Source 
* commit '1da2255d4f7c6289f2caa63fd5a6f8d8724bf84c':
  2.0.0: make qunar happy
This commit is contained in:
李泽玺
2018-11-05 16:30:21 +08:00
parent fd4bc440f2 1da2255d4f
commit b1dade9701
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/climc/shell/treenodes.go
+1 -1
View File
@@ -76,7 +76,7 @@ func init() {
if args.Pid >= 0 {
params.Add(jsonutils.NewInt(args.Pid), "pid")
}
if len(args.Label) >= 0 {
if len(args.Label) > 0 {
params.Add(jsonutils.NewString(args.Label), "name")
}
result, err := modules.TreeNodes.List(s, params)
pkg/scheduler/api/sched.go
+1 -1
View File
@@ -142,7 +142,7 @@ func NewSchedData(sjson *simplejson.Json, count int64, byTest bool) (*SchedData,
if str, err := baremetalID.String(); err == nil {
candidates = append(candidates, str)
}
} else if baremetalID, ok := sjson.CheckGet("prefer_baremetal_id"); ok {
} else if baremetalID, ok := sjson.CheckGet("prefer_baremetal"); ok {
if str, err := baremetalID.String(); err == nil {
candidates = append(candidates, str)
}