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
734 Commits 27 Branches 687 Tags
38febe37696f556f3f749b5a96074e4d78e14edb
Commit Graph
734 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
邱剑 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
邱剑 e46e08fa17 Merge pull request #217 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-zone-capability-spec to release/2.1.0 
* commit 'b7c8d1619fd91eefd78ed4cf98d9ee20b2c35346':
  修正: zone-capability spec 信息不生效
 2018-09-15 10:41:31 +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
邱剑 9e58b400d6 Merge pull request #214 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-conflict-2.2.0-20180914-20 to release/2.2.0 
* commit 'aad6aada760e3db7f5cdb23bfaa3bc4a9fcbe009':
  default unuse cached token
  add change flavor fail status
 2018-09-14 20:23:05 +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
邱剑 ced99b919b Merge pull request #213 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/cache-token to release/2.1.0 
* commit '197a0df5fdbf388dfd3d21ebc5152f3bf32e41d6':
  default unuse cached token
 2018-09-14 20:17:51 +08:00
wanyaoqi 197a0df5fd default unuse cached token 2018-09-14 20:11:28 +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
邱剑 a61c905600 Merge pull request #209 in YUNIONIO/onecloud from feature/meter-resouce-detail-export to release/2.2.0 
* commit '0ff0e22a4c8e71393e04d8ae069743a0d37c7516':
  zhengjiajie modify code
  fmt code
  ftm code
  zhengjiajie submit resource result export
 2018-09-14 19:42:59 +08:00
zhengjiajie 0ff0e22a4c zhengjiajie modify code 2018-09-14 19:06:30 +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
邱剑 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
邱剑 f331e3917d Merge pull request #208 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-network-list-by-region to release/2.1.0 
* commit 'eb77372794804d7f500c188b28ba24ecda6542b3':
  region: network list by cloudregion
 2018-09-14 13:45:35 +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
邱剑 398d51b448 Merge pull request #204 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-deployment-label to release/2.1.0 
* commit 'a70fee75301c9c71cc4aed7db1faa3e42f9cf183':
  climc: add name filter to k8s list resource
  climc: k8s-deployment-create support labels
 2018-09-14 13:45:15 +08:00
邱剑 398f21aec4 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '398d51b44818ee04aee493fdc9ab3360f2202bce':
  climc: add name filter to k8s list resource
  climc: k8s-deployment-create support labels
 2018-09-14 13:45:15 +08:00
Zexi Li eb77372794 region: network list by cloudregion 2018-09-14 13:26:43 +08:00
Zexi Li a70fee7530 climc: add name filter to k8s list resource 2018-09-14 13:17:48 +08:00
zhengjiajie ef725ad155 fmt code 2018-09-14 12:38:34 +08:00
zhengjiajie a9965699ca ftm code 2018-09-14 12:30:27 +08:00
zhengjiajie 71affd88f4 zhengjiajie submit resource result export 2018-09-14 12:17:17 +08:00
李泽玺 91d8ebf69a Merge pull request #207 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-conflict-2.2.0-20180914 to release/2.2.0 
* commit '9af8de9bf8666ef0db1fcb950f534028f36b46e2':
  minior fixes
  修正rebuildroot后API获取的磁盘列表不完整的问题
  Update vendor
  undo changes to virtualjointbase.go
  修正：1. 阿里云rebuild root重构 2. 其他一些fix
 2018-09-14 12:00:56 +08:00
Qiu Jian 9af8de9bf8 minior fixes 2018-09-14 11:57:17 +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
邱剑 173c0996a6 Merge pull request #203 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-bugfix-misc-20180913 to release/2.1.0 
* commit '1c427f3c1b4dbac1098f74139cc09d4007b840ef':
  修正rebuildroot后API获取的磁盘列表不完整的问题
  Update vendor
  undo changes to virtualjointbase.go
  修正：1. 阿里云rebuild root重构 2. 其他一些fix
 2018-09-14 11:21:30 +08:00
Qiu Jian 1c427f3c1b 修正rebuildroot后API获取的磁盘列表不完整的问题 2018-09-14 11:18:20 +08:00
Zexi Li 3f8604e549 climc: k8s-deployment-create support labels 2018-09-14 11:01:55 +08:00
Qiu Jian 314d491e44 Update vendor 2018-09-14 09:32:42 +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 447b0b4a1c undo changes to virtualjointbase.go 2018-09-14 01:42:59 +08:00
Qiu Jian f7769ef1e3 修正：1. 阿里云rebuild root重构 2. 其他一些fix 2018-09-14 01:15:41 +08:00
李泽玺 f922bc1b0d Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '5b74e3c8e60956682d043f833994dd4d2c9a5c43':
  climc: k8s options, code refactor
 2018-09-13 18:24:58 +08:00
李泽玺 5b74e3c8e6 Merge pull request #202 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-climc-k8s.v3 to release/2.1.0 
* commit 'f1fec1b49e2d57456f14a0f7f6db4ceec037a4e2':
  climc: k8s options, code refactor
 2018-09-13 18:24:57 +08:00
邱剑 5ac4030c8b Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '8d55a35d1d76a91ac0db04c2079f14463f1e0833':
  zones/<zone_id>/capabilities => zones/<zone_id>/capability climc changes
 2018-09-13 16:49:47 +08:00
邱剑 8d55a35d1d Merge pull request #201 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-zone-capabilities-conflict-climc to release/2.1.0 
* commit '7512a060beedd771a38b83ab17fe6f62842f8d4e':
  zones/<zone_id>/capabilities => zones/<zone_id>/capability climc changes
 2018-09-13 16:49:47 +08:00
Zexi Li f1fec1b49e climc: k8s options, code refactor 2018-09-13 15:04:39 +08:00