Merge pull request #481 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-conflict-20181113-2.2.0 to release/2.2.0

* commit 'fbf31b2f13d28ae10a0f49e69e7c3e23cbce1768':
  在线更改配置,不需要等待虚机状态为ready
This commit is contained in:
邱剑
2018-11-13 12:23:06 +08:00

Diff Content Not Available