opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,983 Commits 27 Branches 687 Tags
bdb60e3acd18a2e4159d582fd27cd80d210dfdba
Commit Graph
548 Commits
Author SHA1 Message Date
wanyaoqi bdb60e3acd resolve conflict 2018-11-28 15:23:56 +08:00
wanyaoqi eb57a4c531 add guest actions 2018-11-28 11:23:58 +08:00
邱剑 696a7f230c Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'f8d0421f7ac925df8ede2053407e88bcd875c616':
  避免image_id未做转换后导致rebuild-root任务失败
 2018-11-27 21:06:38 +08:00
邱剑 e65e6f4350 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '696a7f230cdd403d9f0fde127c46c83c1398f9d2':
  避免image_id未做转换后导致rebuild-root任务失败
 2018-11-27 21:06:38 +08:00
屈轩 957a4c0744 避免image_id未做转换后导致rebuild-root任务失败 2018-11-27 21:04:10 +08:00
屈轩 e98957b337 解决冲突 2018-11-26 16:27:32 +08:00
邱剑 411195176d Merge pull request #555 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-secgroup-sync to release/2.2.0 
* commit '5dc063ee40b60dbbce48cc036053e2171dace8e1':
  初始化model
 2018-11-26 13:47:04 +08:00
屈轩 5dc063ee40 Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-secgroup-sync 2018-11-26 11:10:43 +08:00
邱剑 78e9154b4f Merge pull request #561 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resize-opslog-notes to release/2.3.0 
* commit '46b67e9dc97834baae30515e55170311d13450a6':
  minor updates
  1. resize opslog notes to VARCHAR(2048) 2. cloudaccount sync status check
 2018-11-23 15:04:09 +08:00
Zexi Li bec79cde6a host ping catalog add elasticsearch service 2018-11-23 14:18:41 +08:00
Qiu Jian f2522b980c 1. resize opslog notes to VARCHAR(2048) 2. cloudaccount sync status 
check
 2018-11-23 09:48:50 +08:00
屈轩 e1284e60cd rebase 2018-11-22 21:24:39 +08:00
屈轩 e6d68a947c 兼容从2.3.0降级到2.2.0 2018-11-22 21:21:41 +08:00
邱剑 383264c137 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'd267f92e8e5e74ae8da3e5b4e1de8020694e2310':
  避免因snapshot找不到而删除失败
 2018-11-21 21:52:29 +08:00
Qiu Jian bd415e8da9 修正：vmware主机获取账号信息失败 2018-11-21 21:21:24 +08:00
Yousong Zhou a62f7e1db2 cloudproviders: reword error message in create data validation 2018-11-20 09:13:25 +00:00
屈轩 4f63b4ad58 避免因snapshot找不到而删除失败 2018-11-20 16:20:29 +08:00
Yousong Zhou 4af0ce699c loadbalancers: use httperrors for parameter validation results 2018-11-19 10:54:17 +00:00
邱剑 d5fdd3e78b Merge pull request #537 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-clear-scheduler-cache to release/2.3.0 
* commit '04917c93453febb0843a178ac9f1b3c9327fe3f8':
  刷新scheduler缓存
 2018-11-17 17:45:21 +08:00
Qiu Jian 532f5ae1af 虚拟机启动时如果已经启动，会丢失start的osplog事件 2018-11-17 17:27:05 +08:00
邱剑 81e17c25ab Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '0e53e16d4dca4c1d1ca3a5ae35fda919e5a1e56d':
  取消创建公有云vpc限制
 2018-11-17 15:55:19 +08:00
屈轩 c6c1b17c3e 取消创建公有云vpc限制 2018-11-17 15:53:11 +08:00
屈轩 04917c9345 刷新scheduler缓存 2018-11-17 15:31:30 +08:00
屈轩 aff50b0de4 ”刚导入进来的新订阅默认状态未connected“ 2018-11-17 14:28:26 +08:00
李泽玺 8bc8f2a754 Merge pull request #528 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lblis-clear-acl_id to release/2.3.0 
* commit 'ddbbb24fcf4bb95fa32eb4f33fd989d198a36ed8':
  loadbalancers: exclude pending_deleted when checking uniqueness
  loadbalancerlisteners: more complete acl fields validation
 2018-11-17 10:55:14 +08:00
屈轩 0770e52eea 解决冲突 2018-11-16 23:08:29 +08:00
Yousong Zhou ddbbb24fcf loadbalancers: exclude pending_deleted when checking uniqueness 2018-11-16 14:51:07 +00:00
Yousong Zhou 97162f5965 loadbalancerlisteners: more complete acl fields validation 2018-11-16 14:51:06 +00:00
周有松 35e65898b4 Merge pull request #523 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lblis-clear-acl_id to release/2.3.0 
* commit '76c60926c6ee6f77fe9303ee1c6fb38b1319783f':
  loadbalancerlisteners: clear out acl_id when acl_status=off
 2018-11-16 21:09:35 +08:00
Yousong Zhou 76c60926c6 loadbalancerlisteners: clear out acl_id when acl_status=off 2018-11-16 12:18:28 +00:00
Zexi Li f65e031597 usage: fix schedtag usage panic 2018-11-16 18:43:50 +08:00
屈轩 503bec34c8 去除不需要接口 2018-11-16 17:59:45 +08:00
邱剑 e5d0321695 Merge pull request #517 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-networks-port-used to release/2.3.0 
* commit '6d27d05ae78de72e58e5d29e76f99330dd68bcac':
  networks: add "port_used" field to details listing
 2018-11-16 16:52:03 +08:00
屈轩 2e868ed7c1 避免公有云找不到对应的cloudregion 2018-11-16 16:09:02 +08:00
屈轩 a07ab4c121 初始化model 2018-11-16 15:05:05 +08:00
屈轩 4c4b93aa4b 避免公有云账号认证失败后返回系统登录界面 2018-11-16 14:53:06 +08:00
Yousong Zhou 6d27d05ae7 networks: add "port_used" field to details listing 2018-11-16 04:15:49 +00:00
Qiu Jian bfdb74bcfd Merge branch 'release/2.2.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181115-2.3.0 
Conflicts:
	pkg/compute/hostdrivers/base.go
 2018-11-15 11:12:07 +08:00
邱剑 44801052b5 Merge pull request #500 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-disk-name-change to release/2.2.0 
* commit 'b4c3ce139fa2a2f6a7c932ac2bee0b9c36b3651f':
  避免更新Azure disk名称
 2018-11-15 11:08:22 +08:00
屈轩 b4c3ce139f 避免更新Azure disk名称 2018-11-14 21:48:14 +08:00
邱剑 3d13c99799 Merge pull request #499 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-name-change to release/2.2.0 
* commit '0764bed0864c4de66273ed713a6ee519890128a2':
  避免更新Azure guest名称
 2018-11-14 21:31:36 +08:00
邱剑 68b9756787 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '3d13c99799c7c73f86b4aeb32a946e3b2eea9ab0':
  避免更新Azure guest名称
 2018-11-14 21:31:36 +08:00
屈轩 0764bed086 避免更新Azure guest名称 2018-11-14 21:24:50 +08:00
邱剑 f72ee1063f Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'f18eb7ddec21a3016fbd698cf5a7fa4c6e3603d2':
  避免Azure绑定秘钥时stop机器
  更新Azure密钥后直接返回
 2018-11-14 16:15:55 +08:00
屈轩 ea620ef7ca 避免Azure绑定秘钥时stop机器 2018-11-14 15:40:52 +08:00
邱剑 6ca618d539 Merge pull request #487 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-cloudaccount-optimization to release/2.3.0 
* commit '1ff0252f3f8ad3ae0db03d8f0d02c084270b5848':
  优化cloudprovider删除enable、disable逻辑
 2018-11-13 22:02:24 +08:00
邱剑 8a146a92f9 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '11d305933001cdd41adde0cf3bb7d5c0319ade85':
  补充主机计费的shortdesc参数
 2018-11-13 22:01:03 +08:00
邱剑 70e64329e9 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '8a146a92f981d3fb318ab33fc2a0efde1ae77740':
  补充主机计费的shortdesc参数
 2018-11-13 22:01:03 +08:00
邱剑 11d3059330 Merge pull request #490 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-server-short-desc to release/2.1.0 
* commit '36dda2a5b4ac268280c3e660d29666dcc6a68060':
  补充主机计费的shortdesc参数
 2018-11-13 22:01:02 +08:00
Qiu Jian db9fd8aeb3 Merge branch 'release/2.2.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181113-2.3.0 
Conflicts:
	pkg/scheduler/db/models/default.go
 2018-11-13 19:10:40 +08:00