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
8,357 Commits 30 Branches 714 Tags
04f9ccaba8a29da428fd242545774bdf7dae3514
Commit Graph
8357 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Zexi Li 6689b5c4a4 Merge pull request #4081 from rainzm/bugfix/instance_group_2.13 
fix: Fix the unexpected json field coverage after GetCustomizeColumns
 2019-12-10 16:10:44 +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
Zexi Li b91aa5274b Merge pull request #4079 from rainzm/bugfix/server-template 
fix(region): Fix the list bug of Guest Template
 2019-12-10 15:47: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
Zexi Li fdf6f1cbde Merge pull request #4067 from rainzm/bugfix/guest_tempalte_param 
fix(region): Guest template & Service catalog
 2019-12-10 10:52:43 +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
Zexi Li 68156f4a47 Merge pull request #4064 from swordqiu/hotfix/qj-host-cache-image-not-work 
fix: host-cache-image might not work
 2019-12-10 10:02:59 +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 8671abbe53 Merge pull request #4062 from wanyaoqi/bugfix/wyq/docker-push 
bugfix: fix docker push script component name
 2019-12-09 15:47:52 +08:00
wanyaoqi cd99aa4527 fix docker push script component name 2019-12-09 15:45:06 +08:00
Zexi Li 92d546c9a7 Merge pull request #3998 from wanyaoqi/feature/wyq/add-bundles-libraries-scripts 
feature: add bundle libraries script for build host image
 2019-12-09 11:38:40 +08:00
Zexi Li ed2ee4f8b5 Merge pull request #4008 from ioito/hotfix/qx-secgroup-fix 
fix: 安全组同步优化,避免规则不同的安全组可以合并
 2019-12-09 11:34:58 +08:00
Zexi Li 2186ead796 Merge pull request #3805 from rainzm/feature/guest_template 
feature: Guest Template & Service Catalog
 2019-12-09 11:31:08 +08:00
郑雨 06eccd18d8 feat(region): Add Guest Template & Service Catalog 
Modify the structure of ServerCreateOptions so that
GuestTemplateCreateOptions can reuse most field.
 2019-12-09 11:24:01 +08:00
yunion-ci-robot 45302ab49f Merge pull request #4045 from rainzm/feature/vm_resume 
feat(region): Support for resuming vm suspended in vmware
 2019-12-09 11:15:37 +08:00
Zexi Li b70decaf24 Merge pull request #3997 from wanyaoqi/feature/wyq/host-use-command-executor 
feature: host container deployment
 2019-12-09 10:49:49 +08:00
yunion-ci-robot acea8e6fd0 Merge pull request #4057 from ioito/bugfix/qx-rds-sku-medel-init 
fix: 避免在初始化model时设置rds sku handler
 2019-12-09 10:45:37 +08:00
屈轩 106a06f097 fix: 避免在初始化model时设置rds skuhandler 2019-12-08 12:40:19 +08:00
yunion-ci-robot c74a0b72b6 Merge pull request #4040 from ioito/hotfix/qx-cloudregion-external-id 
fix: 返回region external_id
 2019-12-07 17:41:36 +08:00
yunion-ci-robot 0b1f80c99f Merge pull request #4047 from wanyaoqi/bugfix/wyq/fix-brands-filter 
region misc bugfix
 2019-12-07 17:15:36 +08:00
yunion-ci-robot fe7988ae15 Merge pull request #4035 from ioito/bugfix/qx-secgroup-privilege 
fix: 避免普通用户添加规则到系统安全组
 2019-12-06 23:21:35 +08:00
Qu Xuan 4509a804e0 fix: 返回region external_id 2019-12-06 20:27:05 +08:00
yunion-ci-robot 87c72c89d7 Merge pull request #4032 from tb365/bugfix/tb-bugfix-1205 
image upload bugfix
 2019-12-06 18:26:35 +08:00
wanyaoqi ac9a988e91 region misc bugfix 
- fix capabilities filter disabled account
- fix kvm guest start no logevent
- fix guest restart not set guest status immediately
 2019-12-06 17:00:29 +08:00
郑雨 15edc45030 feat(region): Support for resuming vm suspended in vmware 2019-12-06 16:35:37 +08:00
yunion-ci-robot 9b260935f3 Merge pull request #4028 from tb365/feature/tb-redis-1203 
Feature/tb redis 1203
 2019-12-06 15:49:34 +08:00
Qu Xuan 7fdd6200db fix: 避免普通用户添加规则到系统安全组 2019-12-06 14:43:31 +08:00
wanyaoqi e304acb267 add bundle libraries script for build host image 2019-12-06 11:48:48 +08:00
yunion-ci-robot 165183989c Merge pull request #4002 from rainzm/bugfix/instance_group_api 
fix(region): The param of list instancegroup filter by Guest is 'server'
 2019-12-06 11:41:34 +08:00
yunion-ci-robot f5d19c5e1d Merge pull request #3988 from ioito/hotfix/qx-network-create-list 
fix: 结构化network create list 参数
 2019-12-06 11:40:35 +08:00
郑雨 58d8bf212c fix(region): The param of list instancegroup filter by Guest is 'server' 2019-12-06 10:48:33 +08:00
TangBin 070d998987 image upload bugfix 2019-12-06 10:00:24 +08:00
wanyaoqi c8fff1d44f add rpm file, add socket used check 2019-12-05 20:58:57 +08:00
yunion-ci-robot b180d81b93 Merge pull request #3992 from ioito/hotfix/qx-metadata-fix 
fix: 标签添加排序,不统计回收站的资源标签
 2019-12-05 15:21:34 +08:00
yunion-ci-robot 9760a77198 Merge pull request #3985 from tb365/feature/tb-add-ctyun-sync 
Feature/tb add ctyun sync
 2019-12-05 15:20:35 +08:00
yunion-ci-robot cae85c2213 Merge pull request #4021 from wanyaoqi/bugfix/wyq/minor-1204 
bugfix: add socket check of deploy server
 2019-12-05 14:34:36 +08:00
TangBin 5225fd0ff3 add elastic cache skus capability api 2019-12-05 11:18:24 +08:00
TangBin 7c2ccb6088 elastic cache task bugfix 2019-12-05 11:18:24 +08:00
TangBin be45ce1cf2 huawei reset password bugfix 2019-12-05 11:18:24 +08:00
Qu Xuan 061b3872be fix: 标签添加排序,不统计回收站的资源标签 2019-12-05 10:51:47 +08:00