Automatic merge from release/2.1.0 -> release/2.2.0

* commit 'a5f9d9c6871a2d29b6774cf609c87410e7222c7c':
  2.0.0: make qunar happy
This commit is contained in:
李泽玺
2018-11-05 16:30:22 +08:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -144,7 +144,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)
}