opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 07:21:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,767 Commits 30 Branches 714 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph
6987 Commits
Author SHA1 Message Date
Zexi Li 95e63d9f87 climc: kube cluster, node and service resource rename 2018-08-22 03:14:57 +08:00
Zexi Li fd69dbac82 修正: 调度器 baremetal raid config range 没有正确解析 2018-08-22 01:06:10 +08:00
邱剑 bfabe69246 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'f5e86f1520b2781f61edcde2203054e78492bd72':
  修复因添加nil到errors导致野指针引用bug
 2018-08-21 20:52:49 +08:00
邱剑 f5e86f1520 Merge pull request #81 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-region-sync to release/2.0.0 
* commit '241600f4039507449133cd0eb45275d3275f615d':
  修复因添加nil到errors导致野指针引用bug
 2018-08-21 20:52:49 +08:00
Zexi Li 5e8b7b3ce3 fix auto-merge conflict 2018-08-21 20:49:42 +08:00
屈轩 241600f403 修复因添加nil到errors导致野指针引用bug 2018-08-21 20:47:40 +08:00
Zexi Li f84e39f828 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~lizexi/onecloud into feature/lzx-k8s-cli 2018-08-21 20:41:32 +08:00
Zexi Li b95af3dc79 climc: helm api 2018-08-21 20:33:53 +08:00
Yousong Zhou 935b8f02a3 dep: dep ensure update 
- jsonutils: bugfix for unmarshaling non-nil slice
 - prettytable: support printing multiline cells
 - sqlchemy: fix update for ptr fields

Update printutils to remove the redundant newline
 2018-08-21 07:53:49 +00:00
TangBin d33757fbbb 增加CPU、内存变更判断 2018-08-20 15:10:46 +08:00
Zexi Li 9cdbeb943b climc: k8s resource cli 2018-08-20 11:45:10 +08:00
TangBin 8feaa3538b 阿里云调整配置等API 2018-08-20 11:02:37 +08:00
Zexi Li 13aa7b81e9 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~lizexi/onecloud into release/2.1.0 2018-08-17 12:16:15 +08:00
Zexi cbc0c234f2 - climc: 设置 option 没有 subcommand 的情况下进入交互模式, 代码逻辑变清晰 
- make fmt
 2018-08-17 12:11:08 +08:00
Qiu Jian 9d20909625 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.1.0-20180817 
Conflicts:
	Gopkg.lock
 2018-08-17 02:14:53 +08:00
Yousong Zhou 7f0d75cfa1 scheduler: fix wrong import path 2018-08-16 12:50:11 +00:00
邱剑 e9207cf7dc Merge pull request #60 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/misc-201808-15 to release/2.1.0 
* commit '231e94fbd802ae00549b3a0c704b9fdcfcd259a1':
  1.fix corn run task with empyt context
 2018-08-16 19:08:54 +08:00
邱剑 de75c8b308 Merge pull request #63 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-scheduler-container-net to release/2.0.0 
* commit '7cad0d54f39b6bfa87474f80e5136f21e1f8d954':
  scheduler: network container server_type
 2018-08-16 19:04:57 +08:00
邱剑 03002aca3c Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'de75c8b308b71e06a4f1452c408a60ec6c4f6cd9':
  scheduler: network container server_type
 2018-08-16 19:04:57 +08:00
李泽玺 a35c7096dd Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'ecfd32480b5d90b78ea3c59ef435e554596db21a':
  zone capability的hypervisor去重
 2018-08-16 16:23:53 +08:00
Zexi Li 7cad0d54f3 scheduler: network container server_type 2018-08-16 16:19:52 +08:00
TangBin bb5beccf47 add more resources interfaces 2018-08-16 14:19:01 +08:00
Qiu Jian e9d437d173 zone capability的hypervisor去重 2018-08-16 11:47:06 +08:00
wanyaoqi 231e94fbd8 1.fix corn run task with empyt context 2018-08-15 21:52:24 +08:00
邱剑 c905dfd388 Merge pull request #59 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-create-data-check to release/2.1.0 
* commit '7d1d1d1d3759474e104758ab29cb433f961ce2c7':
  修复check create data 使用keyword而不是keywordplural
 2018-08-15 21:45:44 +08:00
屈轩 7d1d1d1d37 修复check create data 使用keyword而不是keywordplural 2018-08-15 21:40:32 +08:00
邱剑 d3c5cf1568 Merge pull request #58 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-disk to release/2.1.0 
* commit '2634b31ea5f7dad29dcabe5686ea1d498e7a1756':
  添加disk 详情信息字段
 2018-08-15 21:03:10 +08:00
邱剑 81b7b329ab Merge pull request #55 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/kvm-server-reset to release/2.1.0 
* commit 'f991bd67f15f73efa54cd765e19848879027ddbc':
  region: kvm server reset, fix climc parmas
 2018-08-15 21:02:56 +08:00
李泽玺 c051506bc5 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'cb814816551a25ec5b81cf02f4cd4e839af7107d':
  auth token add list endpoints method
 2018-08-15 19:52:35 +08:00
屈轩 920fdb8683 添加公有云云硬盘同步操作 2018-08-15 18:51:39 +08:00
屈轩 7cb13784c2 更新数据库前refresh资源信息 2018-08-15 15:41:07 +08:00
屈轩 97877eb3f6 多账号同步依赖manager_id区分 2018-08-15 15:18:46 +08:00
屈轩 2634b31ea5 添加disk 详情信息字段 2018-08-15 15:05:40 +08:00
wanyaoqi f991bd67f1 region: kvm server reset, fix climc parmas 2018-08-15 14:05:16 +08:00
李泽玺 815ec7f94f Merge pull request #46 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-server-secgroup to release/2.1.0 
* commit 'bc73e77e3594992110e74f05a9774ef49952f5ad':
  更改sync算法
  同步阿里云安全组规则到本地
 2018-08-15 12:32:36 +08:00
TangBin ea609cdbd1 auth token add list endpoints method 2018-08-15 10:54:48 +08:00
屈轩 bc73e77e35 更改sync算法 2018-08-14 22:48:11 +08:00
邱剑 6759bc40b7 Merge pull request #53 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/kvm-server-rebuild-root to release/2.1.0 
* commit 'baa7b9e09330352afd2e1088a9f1b837cb12bd09':
  region: server-rebuid-root and fix bug on disk create and disk create failed
 2018-08-14 21:58:01 +08:00
邱剑 26d3f6cc81 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'b4dc54173695fcffd609559465f688eba94423d1':
  修正：aliyun在成功连接后，会缓存成功状态，导致更新错误账号信息后还是显示成功连接
 2018-08-14 21:52:18 +08:00
邱剑 b4dc541736 Merge pull request #52 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-aliyun-cache-success-connected-state to release/2.0.0 
* commit '8311f02839eab526a701bda27424e641bc6292ad':
  修正：aliyun在成功连接后，会缓存成功状态，导致更新错误账号信息后还是显示成功连接
 2018-08-14 21:52:17 +08:00
wanyaoqi baa7b9e093 region: server-rebuid-root and fix bug on disk create and disk create failed 2018-08-14 16:09:35 +08:00
邱剑 c98df1ad45 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'a2d8b3bf994423f88f5306999a8eec8169eec133':
  fixup cronman/doc.go
  修正：cloudprovider的secret字段没有在list中获得
 2018-08-14 12:18:40 +08:00
Qiu Jian 8311f02839 修正：aliyun在成功连接后，会缓存成功状态，导致更新错误账号信息后还是显示成功连接 2018-08-14 12:14:19 +08:00
Qiu Jian 575ec7a9b5 fixup cronman/doc.go 2018-08-14 10:30:03 +08:00
屈轩 1afa94c200 Merge branch 'release/2.1.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-disk-resize 2018-08-13 21:33:21 +08:00
屈轩 f8a299e167 添加aliyun disk resize内容 2018-08-13 20:27:29 +08:00
屈轩 cb62883e5d 添加disk provider过滤参数 2018-08-13 20:10:57 +08:00
Qiu Jian eeec417ebe 修正：cloudprovider的secret字段没有在list中获得 2018-08-13 20:02:32 +08:00
屈轩 6e8a43c43a Merge branch 'release/2.1.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-server-secgroup 2018-08-13 17:21:42 +08:00
屈轩 2676c4fe07 解决冲突 2018-08-13 16:30:00 +08:00