opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 23:41:47 +08:00
Code Issues Packages Projects Releases Wiki Activity
835 Commits 30 Branches 714 Tags
175f01e5c90e0d85372e50fc8cc6ea9cdface3f3
Commit Graph
835 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zhengjiajie 175f01e5c9 zhengjiajie modify list method 2018-09-15 19:31:08 +08:00
zhengjiajie f44ae64773 zhengjiajie modify list method 2018-09-15 19:25:48 +08:00
zhengjiajie bff2fd4649 zhengjiajie modify code style 2018-09-15 17:24:59 +08:00
zhengjiajie b09e6da1fc zhengjiajie modify column items 2018-09-15 15:56:15 +08:00
邱剑 ba5c6ad824 Automatic merge from release/2.2.0 -> master 
* commit '86eca9166f40b8653bc28fdae865585727c56062':
  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
邱剑 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 d9e401249e adjust import order 2018-09-15 12:40:32 +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
邱剑 162a5eea08 Automatic merge from release/2.2.0 -> master 
* commit '38febe37696f556f3f749b5a96074e4d78e14edb':
  修正: zone-capability spec 信息不生效
 2018-09-15 10:41:32 +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
邱剑 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
李泽玺 981b543e87 Automatic merge from release/2.2.0 -> master 
* commit '33a98593cb61f837277331bcb73652f332543235':
  region: capabilities add specs
  region: query model by spec keys, filter by zone
  region: spec handler
 2018-09-15 10:16:31 +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
邱剑 4fe7669a2b Automatic merge from release/2.2.0 -> master 
* commit '9e58b400d62459400d5b120b5ece083f30e5af4f':
  default unuse cached token
  add change flavor fail status
 2018-09-14 20:23:05 +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
邱剑 0518dbc901 Automatic merge from release/2.2.0 -> master 
* commit 'a61c9056003255c7fd35803d23a3be3ff22ea5aa':
  zhengjiajie modify code
  fmt code
  ftm code
  zhengjiajie submit resource result export
 2018-09-14 19:42:59 +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
邱剑 44dcf72cf1 Automatic merge from release/2.2.0 -> master 
* commit '4d03e9b605ff24696bf2dc4a435d281832523175':
  增加 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
邱剑 1cad4f9723 Automatic merge from release/2.2.0 -> master 
* commit '2855cfbf8a2ccdd82e4f4b4883410aa715e1abda':
  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
邱剑 8965017490 Automatic merge from release/2.2.0 -> master 
* commit '784dc871e4d54f9a6fc8576821489b605b33ef88':
  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
邱剑 9835d9ebd3 Automatic merge from release/2.2.0 -> master 
* commit '398f21aec41525bab73506e09e41d7a53a4b920c':
  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