opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-29 17:58:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/2.1.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.2.0-20180914-20

Browse Source 
Conflicts:
	pkg/compute/models/guests.go
This commit is contained in:
Qiu Jian
2018-09-14 20:21:19 +08:00
parent a61c905600 ced99b919b
commit aad6aada76
3 changed files with 51 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guests.go
+4 -3
View File
@@ -74,9 +74,10 @@ const (
VM_MIGRATING = "migrating"
VM_MIGRATE_FAILED = "migrate_failed"
VM_CHANGE_FLAVOR = "change_flavor"
VM_REBUILD_ROOT = "rebuild_root"
VM_REBUILD_ROOT_FAIL = "rebuild_root_fail"
VM_CHANGE_FLAVOR = "change_flavor"
VM_CHANGE_FLAVOR_FAIL = "change_flavor_fail"
VM_REBUILD_ROOT = "rebuild_root"
VM_REBUILD_ROOT_FAIL = "rebuild_root_fail"
VM_START_SNAPSHOT = "snapshot_start"
VM_SNAPSHOT = "snapshot"