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
1120 Commits
Author SHA1 Message Date
邱剑 694310f144 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'd45c1061ebcf445d7e2374a847b75b966b74c77a':
  climc: 在stderr输出错误信息
 2018-12-12 23:08:18 +08:00
Yousong Zhou 56370457dd climc: 在stderr输出错误信息 2018-12-12 15:02:26 +00:00
Qiu Jian 4ede254c1d Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-region-geographicinfo 2018-12-12 22:56:19 +08:00
Qiu Jian 8f11b765d9 1. 
对disk/elasticip/networks/snapshot/storages/vpc/wire/routetable/servers等支持manager/account/provider过滤查询
2. 详情增加SCloudProviderInfo信息
 2018-12-12 22:53:13 +08:00
Yousong Zhou 010cafa4c5 routetables: routetable-purge支持 2018-12-12 14:20:43 +00:00
屈轩 6590a00f2a 冲突解决 2018-12-12 21:36:17 +08:00
邱剑 90b250c2da Merge pull request #717 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/server-create-disk-by-snapshot to release/2.4.0 
* commit 'ad2de3384697067d40a68e06e7870c2a9e9612b3':
  fix code
  add snapshot reference count, fix code
  server create disk by snapshot, mount snapshot by fusefs
 2018-12-12 21:15:19 +08:00
邱剑 52ff998385 Merge pull request #742 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-host-undo-recycle-duplicate-external-id to release/2.4.0 
* commit '33e0269d081ab3a0afe7b2501ec032b502ef95ec':
  minor fixes
  修正：prepaid recycle host的storage driver设置为Linux
  修正：host-undo-recycle fail
 2018-12-12 21:03:20 +08:00
李泽玺 d3a25e44ce Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'ae4d2fdaec0d52936a055e3bb17544ba5db2da58':
  climc: make scheduler test project work
 2018-12-12 20:21:15 +08:00
Zexi Li 9a80956ffa climc: make scheduler test project work 2018-12-12 20:19:54 +08:00
Qiu Jian e0d7cbb431 修正：host-undo-recycle fail 2018-12-12 19:23:03 +08:00
TangBin e00a2005f2 Merge branch 'release/2.4.0' into feature/tb-skus-support-private-cloud 2018-12-12 15:41:59 +08:00
邱剑 2f325530ef Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'ec71bc2fe99668a49fa2cc1b92413798cf6bec4a':
  loadbalancers: 增加rps限速支持
  loadbalancers: 清理监听选项名
  loadbalancers: 移除Bandwidth字段
 2018-12-12 15:32:47 +08:00
zhengjiajie 31cb423a2f zhengjj add files 2018-12-12 11:53:45 +08:00
Yousong Zhou 5564929e34 loadbalancers: 增加rps限速支持 2018-12-12 03:44:30 +00:00
Qiu Jian 0cc221e78a Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-region-geographicinfo 2018-12-12 09:20:39 +08:00
Qiu Jian 5d5b9c8c85 增加：1. region的区域信息 2. 完善host的公有云账号信息 2018-12-12 00:09:07 +08:00
TangBin b8f3e6632d update skus climc 2018-12-11 20:55:21 +08:00
wanyaoqi 6a6806e65b server create disk by snapshot, mount snapshot by fusefs 2018-12-11 20:46:36 +08:00
TangBin 9318bf6683 update sku create & update & list method 2018-12-11 19:36:21 +08:00
TangBin da559be138 update sku create & update & list method 2018-12-11 17:52:28 +08:00
zhengjiajie 34ade66e93 modify ad fmt file 2018-12-11 17:03:00 +08:00
zhengjiajie beec785040 add bill-detail file 2018-12-11 16:29:50 +08:00
Yousong Zhou e2fad5b299 treewide: 改正structarg AddArgument()时Duplicate argument xxx错误 2018-12-10 08:26:56 +00:00
Qiu Jian cc7da24faa Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-vm-resource-pooling 2018-12-10 01:08:09 +08:00
Qiu Jian 00a17b360e update usage statics for prepaid-pool servers 2018-12-10 00:50:26 +08:00
Qiu Jian b69bc264a2 修正：1. 多余1个磁盘的recycle主机创建失败 2018-12-08 10:29:16 +08:00
Zexi Li c13c7da0a2 climc: set default manager api version 2018-12-07 22:11:24 +08:00
Qiu Jian 965e84ea36 update 2018-12-07 02:57:58 +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
邱剑 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
邱剑 9490f51c52 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '5a203a4fd4d12093f4573e2b9d69920de57b1f0c':
  usage增加更多hosttypes
 2018-12-05 16:15:45 +08:00
Qiu Jian 6afc43fb3b usage增加更多hosttypes 2018-12-05 16:12:14 +08:00
屈轩 e34e45d008 限制虚机绑定安全组数量 2018-12-05 12:40:47 +08:00
Qiu Jian 3e87c17e72 support prepaid server create and renew 2018-12-05 00:40:15 +08:00
屈轩 2608e8e6b9 初始化model 2018-12-03 21:12:44 +08:00
邱剑 f30c79d969 Merge pull request #629 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-kvm-sku-support to release/2.4.0 
* commit '8d4266afad4f0174ed88f6586857a070de921a5f':
  bugfix
  skus update
  InstanceTypeCategory chaset
 2018-12-01 15:00:00 +08:00
Qiu Jian 6b19a7a1e8 Merge branch 'release/2.3.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.4.0-20181201 
Conflicts:
	pkg/compute/guestdrivers/azure.go
	pkg/compute/guestdrivers/managedvirtual.go
	pkg/compute/guestdrivers/qcloud.go
	pkg/compute/models/guest_actions.go
 2018-12-01 14:19:53 +08:00
TangBin cec80f4a62 skus update 2018-12-01 12:47:21 +08:00
李泽玺 fea8c29fa7 Merge pull request #620 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-release-rollback to release/2.3.0 
* commit '8e4c1e1672f4d4aa38cf221892888c95bc93d9f2':
  climc: k8s release rollback
 2018-12-01 11:47:13 +08:00
Qiu Jian 9cac0cd0f7 Merge branch 'release/2.2.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.3.0-20181130 
Conflicts:
	cmd/climc/shell/servers.go
	pkg/compute/models/guest_actions.go
 2018-11-30 23:13:51 +08:00
wanyaoqi 1530ca8914 add guest extra options 2018-11-30 20:30:10 +08:00
Zexi Li 8e4c1e1672 climc: k8s release rollback 2018-11-30 19:57:40 +08:00
邱剑 18b6944fd8 Merge pull request #599 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/v2-add-misc-handler to release/2.4.0 
* commit 'bcaa0bf4f66195297f53cc52a38f3da21a5f5093':
  add configure rbd storage
  add misc handler, register baremetal handler; change the monitor request to POST
 2018-11-30 12:20:32 +08:00