Commit Graph
17440 Commits
Author SHA1 Message Date
wanyaoqi 0eee379b8c fix code 2018-08-01 17:20:55 +08:00
Zexi Li c02d03b50c add rpms required files 2018-08-01 16:25:58 +08:00
李泽玺 c73960ff71 Automatic merge from release/2.0.0 -> release/2.1.0
* commit '6a7d18699ea81018f7664674eb0c8999783f42ed':
  climc: add kube service cli api
2018-08-01 16:08:40 +08:00
李泽玺 bdd0435476 Automatic merge from release/2.1.0 -> master
* commit 'c73960ff718e352ce03b77fa3b072cadc0ab04b5':
  climc: add kube service cli api
2018-08-01 16:08:40 +08:00
李泽玺 6a7d18699e Merge pull request #4 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-add-k8s-cli to release/2.0.0
* commit 'f9f6a4fc10b7e19a45eb13e3f93cb00b6423f578':
  climc: add kube service cli api
2018-08-01 16:08:39 +08:00
Zexi Li f9f6a4fc10 climc: add kube service cli api 2018-08-01 15:51:50 +08:00
李泽玺 a857bf0964 Automatic merge from release/2.0.0 -> release/2.1.0
* commit '7bbdaab05abe8a0811df396fb55ff6c8743100bc':
  修正:keypair owner_id长度不足,导致新建keypair的用户ID不能正确保存
2018-08-01 15:12:44 +08:00
李泽玺 f0351bae15 Automatic merge from release/2.1.0 -> master
* commit 'a857bf0964baa4e98ca2f1dd66f4178d7d756cf4':
  修正:keypair owner_id长度不足,导致新建keypair的用户ID不能正确保存
2018-08-01 15:12:44 +08:00
李泽玺 7bbdaab05a Merge pull request #3 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:bugfix/qj-wrong-owner-id-db-length to release/2.0.0
* commit 'e2ad53cebe7491ce3356e5a721edbad30cd72b6e':
  修正:keypair owner_id长度不足,导致新建keypair的用户ID不能正确保存
2018-08-01 15:12:44 +08:00
Qiu Jian e2ad53cebe 修正:keypair owner_id长度不足,导致新建keypair的用户ID不能正确保存 2018-08-01 15:10:16 +08:00
wanyaoqi d10484ea45 fix code 2018-08-01 15:02:06 +08:00
wanyaoqi 18490e9961 update jsonutils 2018-08-01 15:02:06 +08:00
wanyaoqi c3f5d0b194 first commit 2018-08-01 15:01:39 +08:00
李泽玺 d036646ab6 Merge pull request #2 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-merge-mcclient to release/2.0.0
* commit 'b5275a0c29cd768314126d87dac57ebdf495e568':
  - mv mcclient to pkg/mcclient - vendor update
2018-08-01 14:28:51 +08:00
李泽玺 e87730d235 Automatic merge from release/2.0.0 -> release/2.1.0
* commit 'd036646ab63c0abb0d219ce0b78816fcecffba9a':
  - mv mcclient to pkg/mcclient - vendor update
2018-08-01 14:28:51 +08:00
李泽玺 8a54dd8522 Automatic merge from release/2.1.0 -> master
* commit 'e87730d23578b0d25515737ace33305030e6a865':
  - mv mcclient to pkg/mcclient - vendor update
2018-08-01 14:28:51 +08:00
Zexi Li b5275a0c29 - mv mcclient to pkg/mcclient
- vendor update
2018-08-01 14:13:23 +08:00
李泽玺 dd7a65f25d Automatic merge from release/2.1.0 -> master
* commit '9097c42a898acec8b868330b7c59b8ecf2d4fd4d':
  测试fork PR
2018-08-01 11:50:32 +08:00
李泽玺 b4ec8935de Merge pull request #1 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:bugfix/qj-minor-patch to release/2.0.0
* commit '538fb576088e97295cfa3c1148b708bfa8ccb4df':
  测试fork PR
2018-08-01 11:50:31 +08:00
李泽玺 9097c42a89 Automatic merge from release/2.0.0 -> release/2.1.0
* commit 'b4ec8935deb11b0cc62d90fd87c5ad9fc6237c72':
  测试fork PR
2018-08-01 11:50:31 +08:00
Qiu Jian 538fb57608 测试fork PR 2018-08-01 11:48:57 +08:00
Jian Qiu e71201a5d2 Merge pull request #4 from yunionio/feature/lzx-aliyuncli
CLI: aliyuncli added
2018-07-31 11:20:06 +08:00
wanyaoqi edfcbf021d Merge pull request #5 from yunionio/feature/lzx-mcclient-vendor-update
vendor: mcclient updated
2018-07-31 11:07:53 +08:00
Zexi Li 5a13f7c97f vendor: mcclient updated 2018-07-31 10:13:35 +08:00
Qiu Jian 89846777af Add back aliyun region-list 2018-07-31 08:54:08 +08:00
Zexi Li dea109d2ad CLI: aliyuncli added 2018-07-31 07:25:07 +08:00
Zexi Li 6f39d0505e Merge pull request #3 from yunionio/bugfix/qj-misc-fix-20180730
20180730修正阿里云BUG
2018-07-31 07:08:59 +08:00
Qiu Jian fcee2de326 修正:1. 由于系统盘大小设置单位未转换,导致阿里云创建主机失败 2.
伪删除阿里云主机后,detach了系统盘,导致主机恢复后无系统盘 3.
修正一些格式错误 4. 补充一些climc命令
2018-07-31 00:42:18 +08:00
屈轩 46dab16451 Merge pull request #2 from yunionio/bugfix/lzx-tristate
vendor update: fix tristate.
2018-07-30 20:51:32 +08:00
Zexi Li e122491d86 vendor update: fix tristate. 2018-07-30 20:47:59 +08:00
Zexi Li 81b50f529d Merge pull request #1 from Zexi/bugfix/scheduler-port-usage
scheduler: fix specified network not enough still pass.
2018-07-30 19:01:51 +08:00
Zexi Li 7a8352ce1c scheduler: fix specified network not enough still pass. 2018-07-30 16:33:29 +08:00
Zexi Li 264440f2fc vendor updated. 2018-07-30 12:34:41 +08:00
Zexi Li 37624f11e2 Add region service. 2018-07-30 12:27:27 +08:00
Zexi Li 270298fae2 Add scheduler service. 2018-07-30 11:18:02 +08:00
Zexi Li 8ba5ffe1b4 compute models added. 2018-07-27 20:44:26 +08:00
Zexi Li 976cc8e640 cloudcommon pkg added. 2018-07-27 19:03:32 +08:00
Zexi Li 0084193400 vendor added. 2018-07-27 16:59:26 +08:00
Zexi Li 660f2c1caa Add climc CLI tool. 2018-07-27 15:59:17 +08:00
Zexi Li 14f1e639a7 Initial commit 2018-07-27 15:15:34 +08:00