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
265 Commits 30 Branches 714 Tags
7679056f550eb14d466e353c838f41fcd831d708
Commit Graph
95 Commits
Author SHA1 Message Date
屈轩 7679056f55 添加storage过滤参数 2018-08-24 20:58:54 +08:00
邱剑 128bf00963 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '183405a31de1943eed4bb4599236ce4daf8cf2c6':
  minor updates
  增加VM操作日志
  修正：创建主机时只选择状态为 available 的网络
 2018-08-24 17:49:31 +08:00
Qiu Jian 32d56101df minor updates 2018-08-24 16:32:08 +08:00
Qiu Jian 931ee5cef6 增加VM操作日志 2018-08-24 16:30:56 +08:00
Qiu Jian 58aecb256d 修正：创建主机时只选择状态为 available 的网络 2018-08-24 16:15:13 +08:00
李泽玺 6a85d3f1a4 Merge pull request #98 in YUNIONIO/onecloud from release/2.0.0 to release/2.1.0 
* commit 'c4692f0d5b8a8457a3fdbfb1f216143f3e7f9bfa':
  bugfix
 2018-08-24 15:39:09 +08:00
Qiu Jian bce76a8ecc Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into bugfix/qj-resolve-conflict-2.1.0-20180824 2018-08-24 15:34:13 +08:00
邱剑 c4692f0d5b Merge pull request #101 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-domain-modify-fix to release/2.0.0 
* commit '038d1c731ba14390ec319b4c28605afef98f1b59':
  bugfix
 2018-08-24 15:23:10 +08:00
TangBin 038d1c731b bugfix 2018-08-24 15:08:13 +08:00
Qiu Jian 644e19e23f 修正：client newsession时候，如果token没有service catalog，导致fatal 
error
 2018-08-24 11:47:46 +08:00
Qiu Jian b23562b019 修正：删除阿里云VPC时由于有securitygroup导致删除失败 2018-08-23 20:39:10 +08:00
Qiu Jian 8ead2a6471 minor fixes 2018-08-23 20:20:00 +08:00
Qiu Jian 242240cb68 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.1.0-20180823-1 2018-08-23 20:16:17 +08:00
Qiu Jian ac4275f48a 增加guest的region_external_id属性 2018-08-23 20:11:10 +08:00
Qiu Jian 4e1c1cd253 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.1.0-20180823 2018-08-23 18:39:09 +08:00
Qiu Jian e681012fd0 虚拟机增加region信息 2018-08-23 18:22:47 +08:00
邱剑 4c07ae8a1e Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '5359543470e4d351ba03ffd90f3e2ee9d5d4e004':
  增加：通过cloud provider来过滤虚拟机的功能
 2018-08-23 14:51:20 +08:00
Qiu Jian 0d6a9f33c6 增加：通过cloud provider来过滤虚拟机的功能 2018-08-23 13:32:11 +08:00
邱剑 006453e7a6 Merge pull request #86 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:bugfix/qj-simpletoken-no-service-url to release/2.1.0 
* commit 'b77f39d194077c6721d47e9e79da7e8095116afd':
  minor updates
  修正：simpletoken没有servicecatalog，导致基于simpletoken的session无法获得service URL
 2018-08-22 16:15:05 +08:00
Qiu Jian b77f39d194 minor updates 2018-08-22 16:11:18 +08:00
Qiu Jian 80571f480f 修正：simpletoken没有servicecatalog，导致基于simpletoken的session无法获得service 
URL
 2018-08-22 12:36:28 +08:00
邱剑 9bf12d5a8b Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '80c56e00fe89c913704d03a3e076c437eaa22fb1':
  修正: 不同 ServiceType 的 module 注册不会报错
 2018-08-22 12:06:57 +08:00
Zexi Li af61f13df6 修正: 不同 ServiceType 的 module 注册不会报错 2018-08-22 11:05:39 +08:00
李泽玺 f2cd5cb856 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'db6e4d63a2611f90759521287ecc3fb5a82839d9':
  climc: kube cluster, node and service resource rename
 2018-08-22 10:32:41 +08:00
李泽玺 db6e4d63a2 Merge pull request #84 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-cli-res-rename to release/2.0.0 
* commit '95e63d9f87b5bee6f836053c122434085cb9cdff':
  climc: kube cluster, node and service resource rename
 2018-08-22 10:32:41 +08:00
邱剑 249c2dbaec Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '16494e75f25ff3f240756f3f3c0c6a3cb5414bfe':
  修正: 调度器 baremetal raid config range 没有正确解析
 2018-08-22 08:01:24 +08:00
邱剑 16494e75f2 Merge pull request #83 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-scheduler-range-size to release/2.0.0 
* commit 'fd69dbac820419340cdca01575f2a8ba6189cde1':
  修正: 调度器 baremetal raid config range 没有正确解析
 2018-08-22 08:01:23 +08:00
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
Zexi Li 9cdbeb943b climc: k8s resource cli 2018-08-20 11:45:10 +08:00
Zexi cbc0c234f2 - climc: 设置 option 没有 subcommand 的情况下进入交互模式, 代码逻辑变清晰 
- make fmt
 2018-08-17 12:11:08 +08:00
Yousong Zhou 7f0d75cfa1 scheduler: fix wrong import path 2018-08-16 12:50:11 +00: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
Zexi Li 7cad0d54f3 scheduler: network container server_type 2018-08-16 16:19:52 +08:00
Qiu Jian e9d437d173 zone capability的hypervisor去重 2018-08-16 11:47:06 +08:00
TangBin ea609cdbd1 auth token add list endpoints method 2018-08-15 10:54:48 +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
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
Qiu Jian eeec417ebe 修正：cloudprovider的secret字段没有在list中获得 2018-08-13 20:02:32 +08:00
邱剑 6762e86dbf Merge pull request #45 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-scheduler-specify-network to release/2.0.0 
* commit 'c7656041a5eb21dcf88a3ce930de78552a5a8273':
  修正: 调度器指定网络批量失败的bug
 2018-08-13 14:59:09 +08:00
Zexi Li c7656041a5 修正: 调度器指定网络批量失败的bug 2018-08-13 14:47:58 +08:00
邱剑 a4f252bbb2 Merge pull request #42 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:bugfix/qj-server-pending-delete-clean to release/2.0.0 
* commit 'f7d815eb641d531eaa5e21d6ff07113d056bdcd4':
  forget to update cronjob lastRun
  修正：增加PendingDeleteCheckSeconds参数，设置多久进行一次扫描
  minor updates
  修正：阿里云主机清理回收站功能
 2018-08-13 12:30:45 +08:00