opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 06:09:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
961 Commits 27 Branches 687 Tags
18261c9281e4b00ec177efb194972bed09b90acc
Commit Graph
590 Commits
Author SHA1 Message Date
邱剑 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
屈轩 6e966b90ee bugfix 2018-09-20 20:46:37 +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
邱剑 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
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
Qiu Jian 6fbc45922c Managed server (aliyun) add manager/manager_id fields 2018-09-20 11:12:14 +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
屈轩 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
邱剑 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
邱剑 06af20eb4b Merge pull request #229 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-cloudcommon-minors to release/2.1.0 
* commit '9efad3e41701e84655d1d081e920daec85e1e73d':
  cloudcommon: virtualresource: allow setting is_system on creation
  cloudcommon: db: more readable log on sql error
 2018-09-18 12:31:01 +08:00
Yousong Zhou 9efad3e417 cloudcommon: virtualresource: allow setting is_system on creation 
We have validation against the field yet the rule tag metadata does not
actually allow it
 2018-09-18 04:04:04 +00:00
邱剑 4d18946c1a Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'fadc94ebe1db560d9213a0698462d270f01930e5':
  阿里云：不缓存阿里云的连接
 2018-09-18 11:54:50 +08:00
邱剑 fadc94ebe1 Merge pull request #228 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-disable-aliyun-provider-cache to release/2.1.0 
* commit '9c1c3c0a70662d7276ba7f476969c1ddb9f92f63':
  阿里云：不缓存阿里云的连接
 2018-09-18 11:54:49 +08:00
Yousong Zhou 284ebcfaab cloudcommon: db: more readable log on sql error 2018-09-18 03:53:22 +00:00
周有松 8831c674ac Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '0620ebe7a41be0c94c95ef4c4c549c0b1e2c9046':
  climc: add printObjectRecursive()
  printutils: add PrintJSONObjectRecursive()
  dep: make dep ensure
 2018-09-18 11:40:29 +08:00
周有松 0620ebe7a4 Merge pull request #226 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:feature/yousong-printjson-tabs to release/2.1.0 
* commit 'b39963bbfcc47e52eb726b3228ee381710837ddc':
  climc: add printObjectRecursive()
  printutils: add PrintJSONObjectRecursive()
  dep: make dep ensure
 2018-09-18 11:40:29 +08:00
Yousong Zhou 946c0d935e printutils: add PrintJSONObjectRecursive() 
E.g. Print

	{"params": {"vrrp":{"advert_int":1,"interface":"br0","pass":"YunionLB","priority":100,"virtual_router_id":100}}}

Will have the following result

	| params.vrrp.advert_int        | 1
	| params.vrrp.interface         | br0
	| params.vrrp.pass              | YunionLB
	| params.vrrp.priority          | 100
	| params.vrrp.virtual_router_id | 100
 2018-09-18 03:39:22 +00:00
邱剑 fa5290f4e4 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '5ddb796c9d51eb3dde002f808010e3f48703f2b7':
  不序列化export_file和export_texts
  修正：qutoa的images使用量不准确
  支持将list的结果导出为excel文件
 2018-09-18 10:26:15 +08:00
邱剑 5ddb796c9d Merge pull request #227 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-support-excel-export to release/2.1.0 
* commit 'ad83b42b1a32cdfaf6aec33a783c9c142d13610c':
  不序列化export_file和export_texts
  修正：qutoa的images使用量不准确
  支持将list的结果导出为excel文件
 2018-09-18 10:26:15 +08:00
邱剑 ab18249465 Merge pull request #177 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-paramter-climc to release/2.2.0 
* commit '96713696b82ebe866f7d91c867d051325d04deea':
  add auth complete callback
  bugfix import path error
  add yunionconf service
  fix help desc string
  bugfix
  add parameter climc
  delete&update parameter in context
  temp!!withbugs
  add climc
 2018-09-18 10:03:37 +08:00
Qiu Jian ad83b42b1a 不序列化export_file和export_texts 2018-09-18 09:46:59 +08:00