opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 15:31:49 +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
邱剑 b000b2b745 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '35db9b00861fafe7eb8f3fcb7a622096dad17040':
  加入腾讯云系统盘大小验证信息
 2018-12-07 20:01:41 +08:00
邱剑 9776483cc3 Merge pull request #692 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-err-check to release/2.1.0 
* commit '817905e8ea5ba7b3245893b8556fb80967245b11':
  错误处理
 2018-12-07 20:01:24 +08:00
邱剑 e0b87302b8 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '9776483cc327ef05921794c1395017fabe441ae0':
  错误处理
 2018-12-07 20:01:24 +08:00
屈轩 817905e8ea 错误处理 2018-12-07 18:03:51 +08:00
Qiu Jian e5f91a0e41 make fmt 2018-12-07 18:02:57 +08:00
屈轩 7d97609cdd 加入腾讯云系统盘大小验证信息 2018-12-07 17:59:02 +08:00
邱剑 6d2e3405c6 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '781357045b3e0d1c480e16d32d869132ae2e6f12':
  避免因vpc未赋值导致Sort时nil指针访问
 2018-12-07 17:53:57 +08:00
屈轩 1902ba24a1 避免因vpc未赋值导致Sort时nil指针访问 2018-12-07 17:35:51 +08:00
Qiu Jian fef3834a4b 标准化资源的计费字段信息 2018-12-07 17:27:00 +08:00
Zexi Li 4e344450c5 scheduler: add resource type filter 2018-12-07 15:45:03 +08:00
TangBin bb2e1bb550 network name bugfix 2018-12-07 12:25:00 +08:00
TangBin 11f5d76494 cpu&mem list fix 2018-12-07 11:36:51 +08:00
TangBin 7bde85eaad Merge branch 'release/2.4.0' into bugfix/tb-aws-support 2018-12-07 11:36:09 +08:00
周有松 c3379151d8 Merge pull request #688 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-vpcs-errs to release/2.4.0 
* commit '76f1ba405c417af042d6ebafc69e919e35589a91':
  hosts: GetHostsByManagerAndRegion(): sql调整
  tasks: VpcCreateTask: 风格调整
  vpcs: SyncWithCloudVpc(): 避免重复记日志
  vpcs: GetRegion(): 传递原始err信息
 2018-12-07 10:51:48 +08:00
Qiu Jian 1f5ab8750f add task locks 2018-12-07 09:24:12 +08:00
Qiu Jian 965e84ea36 update 2018-12-07 02:57:58 +08:00
Yousong Zhou 76f1ba405c hosts: GetHostsByManagerAndRegion(): sql调整 2018-12-06 16:40:59 +00:00
Yousong Zhou dddd859c09 tasks: VpcCreateTask: 风格调整 2018-12-06 15:37:44 +00:00
Yousong Zhou 2666bfa2ae vpcs: SyncWithCloudVpc(): 避免重复记日志 2018-12-06 15:02:04 +00:00
Yousong Zhou d50f441c25 vpcs: GetRegion(): 传递原始err信息 2018-12-06 14:56:16 +00:00
邱剑 7c4dc384cc Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '72bad82f1706c85787b24e3750a776c70b68d8d0':
  避免未能及时释放usage quota
 2018-12-06 22:35:31 +08:00
邱剑 90f7684910 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '7c4dc384ccf856fe1583e8677a2df8496b2057de':
  避免未能及时释放usage quota
 2018-12-06 22:35:31 +08:00
邱剑 72bad82f17 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '9e7e48550688c61f414f8e62e8d3dc19d267fa61':
  避免未能及时释放usage quota
 2018-12-06 22:35:30 +08:00
屈轩 fbb12d1216 避免未能及时释放usage quota 2018-12-06 22:30:10 +08:00
邱剑 da88e768db Merge pull request #686 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-add-skus-cpu-spec-list to release/2.4.0 
* commit '3da731590af324776e779c66ffd1e45a0317d2bc':
  新增cpu&mem组合查询
  新增cpu&mem组合查询
 2018-12-06 19:44:03 +08:00
邱剑 e037244918 Merge pull request #685 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-mcclient-res-setmeta to release/2.4.0 
* commit '0120f060b6be2a9bd671e46783582e5468bd6f31':
  mcclient: SetMetadata func for resource
 2018-12-06 18:15:57 +08:00
TangBin 3da731590a 新增cpu&mem组合查询 2018-12-06 17:34:44 +08:00
TangBin eebed5c3a8 新增cpu&mem组合查询 2018-12-06 17:32:53 +08:00
李泽玺 9036649c57 Merge pull request #684 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-project-delete to release/2.4.0 
* commit '9fc85e4df6befc281a2f1e9cef8f3bf809242a9c':
  standalone: 将ExternalId设置为list:"user"
  mcclient: 修复project-delete
 2018-12-06 17:10:22 +08:00
Zexi Li 0120f060b6 mcclient: SetMetadata func for resource 2018-12-06 17:08:51 +08:00
Yousong Zhou 9fc85e4df6 standalone: 将ExternalId设置为list:"user" 
ExternalId已经可以通过接口从别处获取，不必再限制为admin only
 2018-12-06 07:51:12 +00:00
Yousong Zhou aa86ae755e mcclient: 修复project-delete 
- Hosts没有project概念，tenant=xx参数会被忽略
 - 指定tenant=xx需要同时指定admin=1才生效
 2018-12-06 07:28:00 +00:00
邱剑 3205b9b61a Merge pull request #683 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-resetdisk to release/2.4.0 
* commit 'd6ff02f2c5f3904852be6b0f331b3ba4edaa6a50':
  修复: 通用磁盘回滚方法
 2018-12-06 15:03:26 +08:00
屈轩 d6ff02f2c5 修复: 通用磁盘回滚方法 2018-12-06 14:17:17 +08:00
TangBin 8a2dd8f7f4 新建失败的主机不能正常删除bugfix 2018-12-06 11:01:54 +08:00
TangBin 9164c29b4b security group name fix 2018-12-06 10:51:20 +08:00
TangBin 097ee0d67d sync security group bugfix 2018-12-05 20:48:00 +08:00
邱剑 a7e4e48a8b Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '9f8cb5617c3ca99f24d4759479c6826982fb0073':
  修复: webconsole参数缺失，导致yunionapi RPC调用失败
 2018-12-05 20:43:42 +08:00
屈轩 7d3af78f8b 修复: webconsole参数缺失，导致yunionapi RPC调用失败 2018-12-05 20:42:37 +08:00
邱剑 79390632d0 Merge pull request #681 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-webconsole to release/2.1.0 
* commit 'e66be4ca423ee5504db34bf61459e9318a444fd0':
  修复: webconsole参数缺失，导致yunionapi RPC调用失败
 2018-12-05 20:38:17 +08:00
邱剑 3e99850231 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '79390632d02d1cd9471aac0c9c2e09c790e23f94':
  修复: webconsole参数缺失，导致yunionapi RPC调用失败
 2018-12-05 20:38:17 +08:00
邱剑 0ab310fc7d Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '1e0ad11e2ad4e15dd03d10f12c89df1d5b524e89':
  修复: webconsole参数缺失，导致yunionapi RPC调用失败
 2018-12-05 20:38:17 +08:00
邱剑 1e0ad11e2a Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '3e998502317ae0b7c6e99b066ad24e2b439054dc':
  修复: webconsole参数缺失，导致yunionapi RPC调用失败
 2018-12-05 20:38:17 +08:00
屈轩 e66be4ca42 修复: webconsole参数缺失，导致yunionapi RPC调用失败 2018-12-05 20:35:53 +08:00
Qiu Jian dfb2e0e00c Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-vm-resource-pooling 2018-12-05 18:09:11 +08:00
Qiu Jian 8ab0275a36 temp commit 2018-12-05 18:06:57 +08:00
唐斌 749c2f1de4 Merge pull request #679 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-skus-sync to release/2.4.0 
* commit 'ea3df1d1901df9f4869669e894c1894657fb2a33':
  make fmt
  sync skus bugfix
  sku sync add limit & offset
  skus sync with account
 2018-12-05 17:58:50 +08:00
邱剑 06a93f8a79 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '39902718f2f258b34727b15399e42522b0da1dac':
  腾讯云不允许扩容系统盘
 2018-12-05 17:52:49 +08:00
屈轩 099c4fe020 腾讯云不允许扩容系统盘 2018-12-05 17:18:12 +08:00
TangBin ea3df1d190 make fmt 2018-12-05 16:57:05 +08:00