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
yunion-ci-robot 63048da5ca Merge pull request #4148 from swordqiu/hotfix/qj-image-quota-key-type-mismatch 
fix: image quota key type mismatch
 2019-12-13 17:38:00 +08:00
Qu Xuan 90303fde96 fix: 私有云同步的sku归属于default region 2019-12-13 17:37:58 +08:00
Qiu Jian 2b6c274745 fix: image quota key type mismatch 2019-12-13 16:20:55 +08:00
Zexi Li 7a4f3fca6e region: fix schedule input project and domain missing 2019-12-13 16:00:59 +08:00
TangBin 1b7596cbc9 huawei sync instance offset bugfix 2019-12-13 15:38:55 +08:00
yunion-ci-robot 432bcaaf1b Merge pull request #4139 from swordqiu/hotfix/qj-unlimit-negative-quota 
fix: init quota with negative value and negative quota means unlimited
 2019-12-13 14:44:05 +08:00
Qiu Jian c8a07c87ad fix: init quota with negative value and negative quota means unlimited 2019-12-13 13:00:41 +08:00
yunion-ci-robot 2d50da9e40 Merge pull request #4134 from swordqiu/hotfix/qj-esxi-fix-20191213-misc 
fix: misc esxi bugfix 20191213
 2019-12-13 12:57:59 +08:00
yunion-ci-robot b95e7edb93 Merge pull request #4123 from yousong/bugfix/yousong-ifname-check 
guestnetworks: check ifname uniqueness across different networks
 2019-12-13 12:56:01 +08:00
Qiu Jian b94a70124b fix: misc bugfix for esxi 20191213 2019-12-13 12:32:26 +08:00
Qu Xuan c97fe6b74f fix: 避免插入时出现duplicate primary key error 2019-12-13 10:43:34 +08:00
Yousong Zhou cc02ac74d4 guestnetworks: check ifname uniqueness across different networks 
With PerformChangeIpAddr, it can happen that a guestnetwork from network
A can take a name that was originally allocated by network B
 2019-12-12 15:42:47 +00:00
yunion-ci-robot beff6e2287 Merge pull request #4121 from ioito/bugfix/qx-cloudregion-cloudenv 
fix: 避免污染cloud_env参数
 2019-12-12 20:48:00 +08:00
Qu Xuan 71d5736636 fix: 避免污染cloud_env参数 2019-12-12 19:54:19 +08:00
yunion-ci-robot 4fca148874 Merge pull request #4116 from wanyaoqi/bugfix/wyq/minor-1212 
bugfix:fix  baremetal register get service url
 2019-12-12 18:03:03 +08:00
Qiu Jian f0ccabb27e fix: 1. image-quota-list 404 not found 2. usage nil pointer panic 2019-12-12 17:41:59 +08:00
wanyaoqi f0cb9c15d3 fix baremetal register get service url 2019-12-12 17:35:36 +08:00
yunion-ci-robot b2719e5f73 Merge pull request #4090 from swordqiu/feature/qj-quota-recode-recover 
Feature/qj quota recode recover
 2019-12-12 12:41:02 +08:00
yunion-ci-robot 24868824d9 Merge pull request #4109 from bistuzx/master 
add associated_bills & modify meter version
 2019-12-12 12:04:59 +08:00
Qiu Jian aea6a7a591 fix: globalvpc validateCreateData fix 2019-12-12 11:51:35 +08:00
Qiu Jian 110c6bc611 mergeInputOutputJson for ValidateCreateData and ValidateUpdateData 2019-12-12 11:31:47 +08:00
Qiu Jian 0dcbb2147f update vendor 2019-12-12 11:31:47 +08:00
Qiu Jian 9d6d28b36a clean usages when resource deleted 2019-12-12 11:31:47 +08:00
Qiu Jian 0d487cd601 bufix 20191209 2019-12-12 11:31:47 +08:00
Qiu Jian 39de0f0ee7 quota recode update 2 2019-12-12 11:31:46 +08:00
Qiu Jian 3dba5360d7 quota recode 2019-12-12 11:31:41 +08:00
张旭 8e9f5066fe add associated_bills & modify meter version 2019-12-12 11:10:21 +08:00
yunion-ci-robot 5750d6dd59 Merge pull request #4097 from ioito/bugfix/zstack-api-query-encode 
fix: 避免zstack参数含有中文,未编码导致请求失败
 2019-12-12 11:00:38 +08:00
yunion-ci-robot 78cd643996 Merge pull request #4063 from ioito/hotfix/qx-globalvpc-fix 
fix: globalnetwork -> globalvpc
 2019-12-12 10:58:38 +08:00
Qu Xuan 56e3a42c3c fix: 避免zstack参数含有中文,未编码导致请求失败 2019-12-11 23:19:14 +08:00
Qu Xuan f9ae7d9244 fix: globalnetwork -> globalvpc 2019-12-11 22:28:07 +08:00
yunion-ci-robot ef5a977486 Merge pull request #4104 from wanyaoqi/bugfix/wyq/minor-1211 
bugfix: fix image upload log event
 2019-12-11 22:27:41 +08:00
wanyaoqi 24b518a3b7 fix image upload log event 2019-12-11 20:29:18 +08:00
yunion-ci-robot e788fa4401 Merge pull request #4092 from yousong/bugfix/yousong-lb-janitor 
loadbalancerbackends: janitor: move to InitializeData
 2019-12-11 20:12:41 +08:00
Yousong Zhou 8f6db51fd1 loadbalancerbackends: janitor: move to InitializeData 
The janitor only makes sense when inside region service
 2019-12-11 08:20:55 +00:00
yunion-ci-robot 04f9ccaba8 Merge pull request #4072 from ioito/hotfix/qx-guest-tags-export 
fix: 导出用户标签不加user:前缀
 2019-12-11 15:06:41 +08:00
yunion-ci-robot 8281d24eff Merge pull request #4088 from swordqiu/hotfix/qj-storage-cache-image-show-hostinfo 
fix: add hostinfo to storage cached image details
 2019-12-11 10:52:37 +08:00
Qiu Jian eec673e26d fix: add hostinfo to storage cached image details 2019-12-10 21:40:44 +08:00
屈轩 fe3c42810c fix: 兼容参数过滤 (#4054) 2019-12-10 21:26:27 +08:00
屈轩 633302f836 fix: 兼容以前的参数 (#4065) 2019-12-10 21:25:55 +08:00
tb365 7fd8192061 sync server skus from offline data (#4053) 2019-12-10 21:22:00 +08:00
Yousong Zhou fb1725be32 httputils, aliyun: respects env proxy settings (#4084) 
* vendor: update aliyun-oss-go-sdk to v2.0.4

To use ClientOption oss.HTTPClient

* aliyun: use a http client that respects env proxy settings

* httputils: use http.ProxyFromEnvironment by default
 2019-12-10 21:15:09 +08:00
屈轩 64bbf1c518 fix: 子订阅更改项目时也同步更新external project项目信息 (#4068) 2019-12-10 21:12:03 +08:00
郑雨 84661a1bcf refactor: Instance Group's getMoreDetails 2019-12-10 16:00:06 +08:00
郑雨 40d98c08f9 fix: Fix the unexpected json field coverage after GetCustomizeColumns 
一般来说一个资源的detail版本的输出会放在 <ResoureName>Details
这样的结构体中，并且这个结构体包含资源本身。不过一般在 details
的处理函数中（比如GetCustomizeColumns）资源本身的结构体都是默认值，
而jsonutils的unmarshal函数会把默认值（零值）的int类型（也可能会有其他类型）
unmarshal到jsonutils.JSONDict中（string类型就不会有这种情况）。
这会导致返回的extraDict会覆盖掉原来的Dict中的一些字段，这种覆盖并不是所期望的。
所以现在暂时改为用后者来覆盖前者，前者是最终输出的全集。
 2019-12-10 15:58:22 +08:00
郑雨 9142a6eb48 fix(region): Fix the list bug of Guest Template 
1. Add function GetCustomizeColumns for Guest Template
2. Fix the ValidateDeleteCondition for Guest Template
3. Rename Config as ConfigInfo in apis.GuesttemplateDetails
 2019-12-10 15:06:44 +08:00
郑雨 8d21e622ec fix(region): Guest template & Service catalog 
Add the common create input.
Not allow to delete the guest template used by some service catalog.
 2019-12-10 10:34:30 +08:00
Qu Xuan 19ec7cca03 fix: 导出用户标签不加user:前缀 2019-12-09 21:43:22 +08:00
Qiu Jian 0b03a1b1d1 fix: host-cache-image might not work 2019-12-09 17:56:32 +08:00
Zexi Li ed2ee4f8b5 Merge pull request #4008 from ioito/hotfix/qx-secgroup-fix 
fix: 安全组同步优化,避免规则不同的安全组可以合并
 2019-12-09 11:34:58 +08:00