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
邱剑 65541d942d Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'ab6eae05b274abc01be7390e348fea1373c758f9':
  region: server-list add cdrom
 2018-11-08 19:52:51 +08:00
Zexi Li 6bf33cfed5 region: server-list add cdrom 2018-11-08 19:21:47 +08:00
TangBin 467630e0b3 security group sync 2018-11-08 19:18:01 +08:00
屈轩 aab792ffa8 添加部分aliyun操作 2018-11-08 15:37:30 +08:00
TangBin c55f802148 upload image 2018-11-08 15:34:01 +08:00
邱剑 594a7eb3b7 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '78b8294a82af562a381e0f5828fe431b9d89fb01':
  region: no disks created when create container
 2018-11-08 11:59:16 +08:00
邱剑 78b8294a82 Merge pull request #439 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-create-container-no-disk to release/2.3.0 
* commit 'e9095d4b1ba06de34c9e5b4acf3c584d1b2f73bd':
  region: no disks created when create container
 2018-11-08 11:59:16 +08:00
Zexi Li e9095d4b1b region: no disks created when create container 2018-11-08 11:55:13 +08:00
Qiu Jian 1d0ad17e36 fix format 2018-11-08 11:39:48 +08:00
屈轩 77128909ae Merge branch 'release/2.3.0' of ssh://git.yunion.io/yunionio/onecloud into bugfix/qx-secgroup-tenant 2018-11-08 11:37:17 +08:00
屈轩 be3e4c6e38 同步安全组规则时携带项目信息 2018-11-08 11:31:17 +08:00
邱剑 3070af77cb Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '0e5c80e35f0c94e41d34dbf23cb4e2919f00848f':
  同步安全组规则时携带项目信息
 2018-11-08 11:26:48 +08:00
邱剑 0e5c80e35f Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '1df1be46a8fd98a63360b191dfe21eb3863bd3f1':
  同步安全组规则时携带项目信息
 2018-11-08 11:26:48 +08:00
屈轩 5408a4cfc4 同步安全组规则时携带项目信息 2018-11-08 11:23:55 +08:00
邱剑 cded919ce0 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '83299b849b473abaa49881a89ffe61576a6ea779':
  Image添加description字段
 2018-11-08 01:44:23 +08:00
邱剑 7db5cee6f0 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'cded919ce0b585b99e398f5adcbcc2d37caa5798':
  Image添加description字段
 2018-11-08 01:44:23 +08:00
邱剑 90dd6034be Merge pull request #434 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-add-server-sku to release/2.4.0 
* commit '4d43fcd39cbe0f97e9c9e18cf862c26718989f55':
  增加server sku资源，还需要和创建资源流程，以及公有云接口改造支持
 2018-11-08 01:44:00 +08:00
Qiu Jian 388b793490 修正：增加owner级别权限，放置普通用户可以访问系统资源 2018-11-08 01:36:19 +08:00
TangBin c05317079d add aws toHOST_TYPES 2018-11-07 18:42:09 +08:00
TangBin 05f66d60b4 add aws scheduler api 2018-11-07 18:33:32 +08:00
屈轩 3716e88878 Image添加description字段 2018-11-07 17:56:28 +08:00
TangBin c7ff5c6f87 bugfix 2018-11-07 17:50:00 +08:00
TangBin 1f341232de update vendor and fix conficlt 2018-11-07 17:47:00 +08:00
Qiu Jian 4d43fcd39c 增加server sku资源，还需要和创建资源流程，以及公有云接口改造支持 2018-11-07 15:47:46 +08:00
wanyaoqi fb18edce1b fix get vnc port error 2018-11-07 10:55:51 +08:00
Zexi Li 917e1ee954 region: container driver 2018-11-06 21:08:59 +08:00
TangBin 613543a23d add host type mapping 2018-11-06 18:52:54 +08:00
邱剑 223a126793 Merge pull request #429 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-policy-delete-fail to release/2.3.0 
* commit '7208814421e5a1714beb11ee51c377cdff436f66':
  修正：policy删除报错找不到blob
 2018-11-05 18:43:47 +08:00
Qiu Jian 7208814421 修正：policy删除报错找不到blob 2018-11-05 18:33:10 +08:00
邱剑 24509e485f Merge pull request #428 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-role-add-description to release/2.3.0 
* commit 'a497f4dae850df6b8549ecbab7aad8062ed8b145':
  角色增加描述(description)字段
 2018-11-05 18:24:31 +08:00
周有松 8b7388f5ae Merge pull request #423 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lb to release/2.3.0 
* commit 'afb881229d4369e502b72ff5d9e05c49480109a9':
  loadbalancerlisteners: return 409 on port conflict
 2018-11-05 18:22:40 +08:00
Qiu Jian a497f4dae8 角色增加描述(description)字段 2018-11-05 18:12:47 +08:00
李泽玺 f91760e20d Merge pull request #427 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-helm-app to release/2.3.0 
* commit '2feb414106d138a471c3f31c71998f31287cfbd7':
  climc: add k8s servicetree and notify app
 2018-11-05 17:32:33 +08:00
Zexi Li 2feb414106 climc: add k8s servicetree and notify app 2018-11-05 16:50:13 +08:00
邱剑 79d2df8155 Merge pull request #426 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-minors-2.3 to release/2.3.0 
* commit '255f5e242ab2f6eb58010d1fb42c7d2940312890':
  lbagent: make sonar happy
 2018-11-05 16:41:26 +08:00
Yousong Zhou 255f5e242a lbagent: make sonar happy 2018-11-05 08:39:50 +00:00
唐斌 62a7711002 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'b2320988c3916da37ebd491dc5d267f0ba0f5e9a':
  yunionconf: make qunar happy
 2018-11-05 16:34:06 +08:00
Yousong Zhou 5299fd63c3 yunionconf: make qunar happy 2018-11-05 08:30:41 +00:00
李泽玺 a5f9d9c687 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'b1dade9701606d505315271a09ef1c88cfc48827':
  2.0.0: make qunar happy
 2018-11-05 16:30:22 +08:00
李泽玺 272b2f0983 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'a534b14586c3fb83476044fe35460ea079641a66':
  2.0.0: make qunar happy
 2018-11-05 16:30:22 +08:00
李泽玺 a534b14586 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'a5f9d9c6871a2d29b6774cf609c87410e7222c7c':
  2.0.0: make qunar happy
 2018-11-05 16:30:22 +08:00
Yousong Zhou 1da2255d4f 2.0.0: make qunar happy 2018-11-05 08:27:14 +00:00
Yousong Zhou afb881229d loadbalancerlisteners: return 409 on port conflict 2018-11-05 06:37:18 +00:00
邱剑 ecfa2ea723 Merge pull request #422 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-climc-resource-fiter-and-cache to release/2.3.0 
* commit 'aa5dfb79272e728a1c7ba302eeaf9fdf711fee49':
  minor updates
  Add dynamic schedtag show command
  1. mcclient.resource增加readfilter和writerfilter，允许为resource增加自定义字段 2. 增加mcclient的获取的缓存，方便缓存mcclient拉取资源
 2018-11-04 10:08:17 +08:00
Qiu Jian aa5dfb7927 minor updates 2018-11-04 01:42:33 +08:00
邱剑 7fb6e0e15e Merge pull request #421 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-aliyun-offset to release/2.1.0 
* commit '09d9990640f50ff4430ae703f9e8a1b6f3deef10':
  修复同步阿里云资源时出现重复资源问题
 2018-11-03 19:58:11 +08:00
邱剑 ad60672977 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '7fb6e0e15ed2d103b81f92ad37243032490a5553':
  修复同步阿里云资源时出现重复资源问题
 2018-11-03 19:58:11 +08:00
邱剑 b399237169 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'ad60672977714ed96738f91aef365e96d971050a':
  修复同步阿里云资源时出现重复资源问题
 2018-11-03 19:58:11 +08:00
Qiu Jian bf456729fe 1. 
mcclient.resource增加readfilter和writerfilter，允许为resource增加自定义字段
2. 增加mcclient的获取的缓存，方便缓存mcclient拉取资源
 2018-11-03 19:53:53 +08:00
屈轩 09d9990640 修复同步阿里云资源时出现重复资源问题 2018-11-03 18:33:34 +08:00