Automatic merge from release/2.6.0 -> master

* commit 'a9e2f2eb6dc88a4d9019f62259226717544e0608':
  修正:capability接口返回的hypervisor列表中忽略了baremetal
This commit is contained in:
李泽玺
2019-01-07 12:13:20 +08:00

Diff Content Not Available