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
920 Commits 27 Branches 687 Tags
93be70e9ac381ba4ff9ad32e07a2d31a50dc79a3
Commit Graph
263 Commits
Author SHA1 Message Date
屈轩 93be70e9ac Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-09-18 21:19:37 +08:00
屈轩 d992661a01 resolve conflict 2018-09-18 15:53:13 +08:00
邱剑 fa5290f4e4 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '5ddb796c9d51eb3dde002f808010e3f48703f2b7':
  不序列化export_file和export_texts
  修正：qutoa的images使用量不准确
  支持将list的结果导出为excel文件
 2018-09-18 10:26:15 +08:00
邱剑 5ddb796c9d Merge pull request #227 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-support-excel-export to release/2.1.0 
* commit 'ad83b42b1a32cdfaf6aec33a783c9c142d13610c':
  不序列化export_file和export_texts
  修正：qutoa的images使用量不准确
  支持将list的结果导出为excel文件
 2018-09-18 10:26:15 +08:00
Qiu Jian 70be87bbe5 修正：qutoa的images使用量不准确 2018-09-17 22:36:50 +08:00
邱剑 34420c83ab Merge pull request #197 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/local-disk-snapshot to release/2.2.0 
* commit 'c02425506d02960a60d849be53d9904b4062d20b':
  fix convert
  if disk resized, update disk size to snapshot size did not auto snapshot when guest not in status ready or running add snapshot-show
  disk reset minor fixs
  fix code
 2018-09-17 12:16:15 +08:00
邱剑 69f9492e2d Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '1a733935b2a43641cb501d4f64a40c54c9fc32d1':
  修正：eip操作失败后没有正确恢复状态
 2018-09-17 11:43:58 +08:00
Qiu Jian c2111bcc6e 修正：eip操作失败后没有正确恢复状态 2018-09-17 09:16:49 +08:00
邱剑 18068b0c1e Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '1bb838607b441c9e4f14240bcc13c0007cbd2d41':
  minor fixes
  minior fixes
  guestdisk support index filter
  修正：1. 阿里云刚删除主机的IP地址不能占用 2. rebuild root no-account-init无效 3. 其他问题...
 2018-09-15 21:30:39 +08:00
邱剑 1bb838607b Merge pull request #220 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-bugfix-misc-20180915 to release/2.1.0 
* commit 'e460919cbe404a9cda851eabadb96cc8575fa524':
  minor fixes
  minior fixes
  guestdisk support index filter
  修正：1. 阿里云刚删除主机的IP地址不能占用 2. rebuild root no-account-init无效 3. 其他问题...
 2018-09-15 21:30:38 +08:00
Qiu Jian fc5b3e68db minior fixes 2018-09-15 18:12:20 +08:00
Qiu Jian f43c278d90 guestdisk support index filter 2018-09-15 18:04:08 +08:00
邱剑 4101fa1bc0 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '3ff6b1d37cf91b19ea85e95371b38a584a7676b8':
  region: user usage
 2018-09-15 18:03:07 +08:00
Zexi Li 1c01d7b45f region: user usage 2018-09-15 17:50:59 +08:00
Qiu Jian c624d4ec6c 修正：1. 阿里云刚删除主机的IP地址不能占用 2. rebuild root 
no-account-init无效 3. 其他问题...
 2018-09-15 17:05:17 +08:00
屈轩 c60ca1d6eb resolve conflict 2018-09-15 14:07:45 +08:00
屈轩 c09a63442f Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-09-15 14:02:21 +08:00
邱剑 86eca9166f Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '7199e848d46f7509d5b10eac00d1623ad073e9e7':
  adjust import order
  fix typos
  增加eip操作的状态变化
  network/wire/vpc增加zone/region信息
  修正：1. 主机创建／rebuild root密码设置问题 2. climc 密码设置问题 3. billing_type字段为空导致创建主机失败问题
 2018-09-15 12:53:10 +08:00
邱剑 7199e848d4 Merge pull request #215 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-bugfix-misc-20180914 to release/2.1.0 
* commit 'd9e401249e5ccd4108e011a47e6145d7ee8e7002':
  adjust import order
  fix typos
  增加eip操作的状态变化
  network/wire/vpc增加zone/region信息
  修正：1. 主机创建／rebuild root密码设置问题 2. climc 密码设置问题 3. billing_type字段为空导致创建主机失败问题
 2018-09-15 12:53:09 +08:00
Qiu Jian 588829bcb0 fix typos 2018-09-15 12:32:42 +08:00
Qiu Jian ee8e8bc2b5 增加eip操作的状态变化 2018-09-15 12:31:27 +08:00
Qiu Jian 876fadd6a8 network/wire/vpc增加zone/region信息 2018-09-15 10:48:28 +08:00
邱剑 38febe3769 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'e46e08fa176e26efb3e3028a67e1f2966fef410e':
  修正: zone-capability spec 信息不生效
 2018-09-15 10:41:32 +08:00
Zexi Li b7c8d1619f 修正: zone-capability spec 信息不生效 2018-09-15 10:39:56 +08:00
李泽玺 33a98593cb Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '91ca98de309e2aeb2eb5af0f7c4cde213585c721':
  region: capabilities add specs
  region: query model by spec keys, filter by zone
  region: spec handler
 2018-09-15 10:16:30 +08:00
李泽玺 91ca98de30 Merge pull request #216 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-spec to release/2.1.0 
* commit '27f7e0d55f3104f0e9bab68fa77b254b45c6e3c2':
  region: capabilities add specs
  region: query model by spec keys, filter by zone
  region: spec handler
 2018-09-15 10:16:30 +08:00
Zexi Li 27f7e0d55f region: capabilities add specs 2018-09-15 10:15:02 +08:00
Zexi Li 2d1484f71e region: query model by spec keys, filter by zone 2018-09-15 05:27:29 +08:00
Zexi Li 2ea45a7120 region: spec handler 2018-09-15 01:49:11 +08:00
Qiu Jian 8c2250517f 修正：1. 主机创建／rebuild root密码设置问题 2. climc 密码设置问题 3. 
billing_type字段为空导致创建主机失败问题
 2018-09-15 00:31:58 +08:00
wanyaoqi c02425506d fix convert 2018-09-14 22:06:29 +08:00
Qiu Jian aad6aada76 Merge branch 'release/2.1.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.2.0-20180914-20 
Conflicts:
	pkg/compute/models/guests.go
 2018-09-14 20:21:19 +08:00
邱剑 18627f4118 Merge pull request #210 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-change-falovr-fix to release/2.1.0 
* commit '0d3d306524efe4a57e7e4165d7307491683f1e39':
  add change flavor fail status
 2018-09-14 19:45:05 +08:00
邱剑 6511872424 Merge pull request #211 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-metadata-charge-type to release/2.1.0 
* commit 'e77106787905b3187fcbdbc24253b7b0792fd559':
  增加 billing_type 和 expire_at 字段，用于计费
 2018-09-14 18:07:10 +08:00
邱剑 4d03e9b605 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '651187242434645e6643331979fbec7de7b46959':
  增加 billing_type 和 expire_at 字段，用于计费
 2018-09-14 18:07:10 +08:00
Qiu Jian e771067879 增加 billing_type 和 expire_at 字段，用于计费 2018-09-14 17:49:29 +08:00
wanyaoqi 7600710fb4 if disk resized, update disk size to snapshot size 
did not auto snapshot when guest not in status ready or running
add snapshot-show
 2018-09-14 17:30:38 +08:00
邱剑 ab8d120580 Merge pull request #205 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/server-desc-sendkey-etc to release/2.1.0 
* commit '1d3ed6ef65c769c09d086c3cdc3cb3e45a9e0a7a':
  server create disk
  minor fix
  attach detach isolate device
  server attach detach network, change bandwidth, some bug fix
  guest desc, guest sendkey, fix disk delete
 2018-09-14 17:04:39 +08:00
邱剑 2855cfbf8a Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'ab8d120580317d802d6a1150c86b91bd0641a341':
  server create disk
  minor fix
  attach detach isolate device
  server attach detach network, change bandwidth, some bug fix
  guest desc, guest sendkey, fix disk delete
 2018-09-14 17:04:39 +08:00
TangBin 0d3d306524 add change flavor fail status 2018-09-14 16:33:23 +08:00
wanyaoqi 1d3ed6ef65 server create disk 2018-09-14 16:03:32 +08:00
wanyaoqi 09cec5721d minor fix 2018-09-14 14:51:56 +08:00
邱剑 784dc871e4 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'f331e3917d7eef2efac7ac1f6df3edd7dafffa26':
  region: network list by cloudregion
 2018-09-14 13:45:35 +08:00
Zexi Li eb77372794 region: network list by cloudregion 2018-09-14 13:26:43 +08:00
wanyaoqi 92bbb9e235 attach detach isolate device 2018-09-14 11:50:22 +08:00
wanyaoqi f910f6ada7 server attach detach network, change bandwidth, some bug fix 2018-09-14 11:50:22 +08:00
wanyaoqi ae336664dd guest desc, guest sendkey, fix disk delete 2018-09-14 11:45:17 +08:00
Qiu Jian 2ece630d4a Merge branch 'release/2.1.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.2.0-20180914 
Conflicts:
	pkg/compute/guestdrivers/aliyun.go
 2018-09-14 11:26:23 +08:00
Qiu Jian 76231936a9 Merge branch 'release/2.1.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-bugfix-misc-20180913 2018-09-14 01:47:12 +08:00
Qiu Jian f7769ef1e3 修正：1. 阿里云rebuild root重构 2. 其他一些fix 2018-09-14 01:15:41 +08:00