opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-01 15:07:17 +08:00
Code Issues Packages Projects Releases Wiki Activity
967 Commits 27 Branches 670 Tags
cc158e397bfda5875ff1da44544a7b0dacb353c5
Commit Graph

967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
邱剑 cc158e397b Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '4917e76ece9b576be6caf0962ba19b833cb7abc4':
  避免assign-secgrp参数传递不一致
 2018-09-25 20:41:42 +08:00
邱剑 4917e76ece Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '3aec2d3b3920c8115b24ba1663b5d653f57f090b':
  避免assign-secgrp参数传递不一致
 2018-09-25 20:41:41 +08:00
邱剑 3aec2d3b39 Merge pull request #246 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-sec-op to release/2.0.0 
* commit '7744547c5e6cb091269c2296047d265f8163e0b3':
  避免assign-secgrp参数传递不一致
 2018-09-25 20:41:41 +08:00
屈轩 7744547c5e 避免assign-secgrp参数传递不一致 2018-09-25 15:26:26 +08:00
邱剑 17d4ce8f66 Merge pull request #244 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-network-create to release/2.2.0 
* commit 'f0ad662ec0ef278c63f395ef4de291687528a22a':
  修复获取network时未加认证信息
 2018-09-21 18:03:01 +08:00
邱剑 18261c9281 Merge pull request #241 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-parameter-json to release/2.2.0 
* commit '56a6c16aa8cce70f341ad615bfe4637510f9e9bf':
  return json value
 2018-09-21 18:02:10 +08:00
屈轩 f0ad662ec0 修复获取network时未加认证信息 2018-09-21 13:28:05 +08:00
李泽玺 71aa5519ca Merge pull request #243 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-secgroup-cod to release/2.2.0 
* commit '6e966b90eea95f5081d45526c80c0fc773bb53c0':
  bugfix
 2018-09-21 10:25:22 +08:00
屈轩 6e966b90ee bugfix 2018-09-20 20:46:37 +08:00
邱剑 3ad67f0845 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'b93d949e9d9e0ebe985b60775655af5276728428':
  zhengjiajie add the post method of project_host
 2018-09-20 19:33:48 +08:00
邱剑 33ec552f15 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '3ad67f084545e115a4ed896a57785045bfb12771':
  zhengjiajie add the post method of project_host
 2018-09-20 19:33:48 +08:00
邱剑 b93d949e9d Merge pull request #242 in YUNIONIO/onecloud from ~ZHENGJIAJIE/onecloud:bugfix/add-projecthost to release/2.0.0 
* commit '8716cf3122a6b5c5e38ae5970d889ff8bf9b5c8f':
  zhengjiajie add the post method of project_host
 2018-09-20 19:33:47 +08:00
zhengjiajie 8716cf3122 zhengjiajie add the post method of project_host 2018-09-20 19:10:51 +08:00
邱剑 bacd9e7ce8 Merge pull request #121 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-azure to release/2.2.0 
* commit '6a54305eb24e7690fd62d24fae3f7d86a2663270':
  security sync
  resolve conflict
  resolve conflict
  resolve conflict
  resolve conflict
  image cache
  添加azure云盘创建代码
  update
  update
  添加创建vpc操作
  update
  用户id和subscriptionID放一起
  添加Azure安全组同步
  添加vendor更新
 2018-09-20 18:22:37 +08:00
邱剑 7d019f0e45 Merge pull request #237 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgroup-sync to release/2.1.0 
* commit '3d64601d3978dd1571eba13f179396d33707c1a9':
  避免同步出现重复安全组
 2018-09-20 18:21:55 +08:00
邱剑 3f4c323b4b Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '7d019f0e45d5e50628f20240c8ada722b14b5eec':
  避免同步出现重复安全组
 2018-09-20 18:21:55 +08:00
TangBin 56a6c16aa8 return json value 2018-09-20 17:45:25 +08:00
屈轩 6a54305eb2 resolve conflict 2018-09-20 16:29:20 +08:00
屈轩 c753e36f74 resolve conflict 2018-09-20 16:25:46 +08:00
屈轩 3d64601d39 避免同步出现重复安全组 2018-09-20 15:14:55 +08:00
李泽玺 8ac87620fa Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '24e0f1867ff2f1818ac92203b49ed6dc13a96318':
  region: guest min memory size to 8MB
 2018-09-20 12:26:32 +08:00
李泽玺 24e0f1867f Merge pull request #240 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-update-container-mem to release/2.1.0 
* commit '79efc7e2d5e17cbcf84d415d9b017c355bf9540e':
  region: guest min memory size to 8MB
 2018-09-20 12:26:31 +08:00
Zexi Li 79efc7e2d5 region: guest min memory size to 8MB 2018-09-20 11:34:46 +08:00
邱剑 c88a8b55f3 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '901eed81b83ccf79e088f94c85ba2781800c36a3':
  Managed server (aliyun) add manager/manager_id fields
 2018-09-20 11:14:23 +08:00
邱剑 901eed81b8 Merge pull request #239 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-aliyun-server-add-manager-fields to release/2.1.0 
* commit '6fbc45922c0036aa5ecc19c9f62ba801ce50783d':
  Managed server (aliyun) add manager/manager_id fields
 2018-09-20 11:14:23 +08:00
Qiu Jian 6fbc45922c Managed server (aliyun) add manager/manager_id fields 2018-09-20 11:12:14 +08:00
周有松 17b444ee37 Merge pull request #236 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-minors to release/2.2.0 
* commit '935d5a85b8660782372e94c10e9db2ece58b338d':
  httperrors: fix formating error messages
 2018-09-20 10:57:26 +08:00
Yousong Zhou 935d5a85b8 httperrors: fix formating error messages 
Fixes 65880ff8 ("mcclient error")

Before and after

	JSONClientError: certificate 55858afc-de3f-4d14-8e09-3de7cd9b8e2c is still referred to by 1 loadbalancerlisteners%!(EXTRA []interface {}=[])
	JSONClientError: certificate 55858afc-de3f-4d14-8e09-3de7cd9b8e2c is still referred to by 1 loadbalancerlisteners
 2018-09-20 02:14:01 +00:00
邱剑 b5ed2666eb Merge pull request #232 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/local-disk-snapshot to release/2.2.0 
* commit '1b44153b1e8c2d6f957f44c0e066398dce026320':
  add validate snapshot name
  aliyun snapshot sync, create, delete; disk reset
 2018-09-20 00:12:52 +08:00
屈轩 03a80615cc resolve conflict 2018-09-19 22:02:01 +08:00
邱剑 cead414257 Merge pull request #230 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-mcclient-error-2.2.0 to release/2.2.0 
* commit '65880ff857363e9ebad28cc0209a553dd78e1566':
  mcclient error
 2018-09-19 17:02:29 +08:00
邱剑 c496dff217 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'f30c554c022f35144a43f7ed2d9313ec5f346e8b':
  避免使用同一个secgroup
 2018-09-19 16:58:16 +08:00
邱剑 f30c554c02 Merge pull request #235 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-secgroup-sync to release/2.1.0 
* commit '4e0c44d9cd5c6b528fcb0cc9f909c6fb2bbc91a8':
  避免使用同一个secgroup
 2018-09-19 16:58:15 +08:00
屈轩 4e0c44d9cd 避免使用同一个secgroup 2018-09-19 16:56:25 +08:00
屈轩 795f5441df security sync 2018-09-19 15:17:18 +08:00
wanyaoqi 1b44153b1e add validate snapshot name 2018-09-19 14:53:57 +08:00
邱剑 a6793a5fc5 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'f41931f252648ba7e28b63934ce5955725ad1135':
  修复磁盘类型颠倒问题
 2018-09-19 14:43:40 +08:00
邱剑 f41931f252 Merge pull request #234 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-disk-create-index to release/2.1.0 
* commit '26e1f888570b7a4d25a1184e4d1351ec2421470f':
  修复磁盘类型颠倒问题
 2018-09-19 14:43:40 +08:00
邱剑 86b44b670c Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '7d973135b33404fc50ec838adf33f52191eea567':
  region: ignore status to update container cpu and memory
 2018-09-19 14:28:38 +08:00
邱剑 7d973135b3 Merge pull request #233 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-update-container-mem to release/2.1.0 
* commit '040722ac8c5959805555ca91472efd1e30742f24':
  region: ignore status to update container cpu and memory
 2018-09-19 14:28:38 +08:00
屈轩 26e1f88857 修复磁盘类型颠倒问题 2018-09-19 13:48:51 +08:00
Zexi Li 040722ac8c region: ignore status to update container cpu and memory 2018-09-19 11:55:18 +08:00
wanyaoqi bd7010b9e2 aliyun snapshot sync, create, delete; disk reset 2018-09-18 21:51:38 +08:00
屈轩 93be70e9ac Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-09-18 21:19:37 +08:00
邱剑 923a5490f9 Merge pull request #231 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-batch-delete to release/2.1.0 
* commit '56e24ec2185c28b3d60982a48993b21fed24edb9':
  climc: batch delete k8s resource
 2018-09-18 16:26:31 +08:00
邱剑 ad3544901a Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '923a5490f9a05a771febf8b5ebc5c82b3f643bb2':
  climc: batch delete k8s resource
 2018-09-18 16:26:31 +08:00
Zexi Li 56e24ec218 climc: batch delete k8s resource 2018-09-18 16:08:21 +08:00
屈轩 d992661a01 resolve conflict 2018-09-18 15:53:13 +08:00
TangBin 65880ff857 mcclient error 2018-09-18 14:50:45 +08:00
邱剑 e1627fdd8a Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '06af20eb4b9ee058ccb6937409cfcbce166bd5d5':
  cloudcommon: virtualresource: allow setting is_system on creation
  cloudcommon: db: more readable log on sql error
 2018-09-18 12:31:01 +08:00