opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-30 18:23:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,416 Commits 30 Branches 712 Tags
8f679a693231da5821ba5a90e39411eff275d061
Commit Graph
5416 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Qiu Jian 8f679a6932 fix: AWS getinstances failed because of missing AMI ID 2019-03-25 12:23:06 +08:00
李泽玺 29ff559f9d Merge pull request #1319 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-shcedtag-policy to release/2.8.0 
* commit '3ba6d4186cb9b69fec7e7c978cc3483d66768bea':
  dynamic schedule support resource type
 2019-03-25 11:18:11 +08:00
Zexi Li 3ba6d4186c dynamic schedule support resource type 2019-03-23 19:31:28 +08:00
邱剑 a48fc8d078 Merge pull request #1316 in YUNIONIO/onecloud from feature/zhengjj-tag-condition-api to release/2.8.0 
* commit 'd4771930166cd41ec94ecf7cac71f75aef45b1a5':
  add tag-detail-api
 2019-03-23 18:15:39 +08:00
邱剑 d4830c64b8 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '85019a73c6012effdd234e605b781af117ac3e0c':
  openstack:避免因disk没有设置volume_type而导致同步磁盘数据不全
  避免因openstack版本低导致不能设置系统盘storage_type导致部署失败
 2019-03-23 18:00:35 +08:00
邱剑 85019a73c6 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'ce4f64a1fc2bca608f449762a2441591e8a8a36d':
  openstack:避免因disk没有设置volume_type而导致同步磁盘数据不全
  避免因openstack版本低导致不能设置系统盘storage_type导致部署失败
 2019-03-23 18:00:34 +08:00
邱剑 ce4f64a1fc Merge pull request #1318 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-bugfix to release/2.6.0 
* commit 'b95e315906e027b73cf169d3aed74bd914005af4':
  openstack:避免因disk没有设置volume_type而导致同步磁盘数据不全
  避免因openstack版本低导致不能设置系统盘storage_type导致部署失败
 2019-03-23 18:00:34 +08:00
屈轩 b95e315906 openstack:避免因disk没有设置volume_type而导致同步磁盘数据不全 2019-03-23 17:34:28 +08:00
屈轩 1dc5c516c0 避免因openstack版本低导致不能设置系统盘storage_type导致部署失败 2019-03-23 15:58:58 +08:00
李泽玺 f2a4181f0e Merge pull request #1317 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-metadata-log-duplicate to release/2.8.0 
* commit '05196aacaa3d9a57d27dae994a57b145a2bcbbc2':
  metadata日志:避免对比更新后的value
 2019-03-23 15:52:17 +08:00
屈轩 05196aacaa metadata日志:避免对比更新后的value 2019-03-23 15:13:55 +08:00
zhengjiajie d477193016 add tag-detail-api 2019-03-23 12:51:27 +08:00
邱剑 88cbc45a77 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'e1a3f5b2e0debf940dc1e1b88e47d4c0fbda206c':
  fix: aws sync metadata ignoring errors
 2019-03-23 10:20:49 +08:00
邱剑 c5dd664b41 Automatic merge from release/2.8.0 -> master 
* commit '88cbc45a77f7c3b1d7b02070b03ba79c84946a7a':
  fix: aws sync metadata ignoring errors
 2019-03-23 10:20:49 +08:00
邱剑 e1a3f5b2e0 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'c759d5ae1d21ff6d5df13dcb4c8b51289025e342':
  fix: aws sync metadata ignoring errors
 2019-03-23 10:20:48 +08:00
邱剑 c759d5ae1d Merge pull request #1315 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-aws-sync-metadata-ignore-errors to release/2.6.0 
* commit 'f91d85337ed0d9348f2a13e5a94142749df5faf0':
  fix: aws sync metadata ignoring errors
 2019-03-23 10:20:48 +08:00
Qiu Jian f91d85337e fix: aws sync metadata ignoring errors 2019-03-22 22:54:30 +08:00
邱剑 7c8ea8fae9 Merge pull request #1313 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-resolve-conflict-2.8.0-2019032201 to release/2.8.0 
* commit '7707985a8c4c375511789a18037b1256c353c38e':
  避免default secgroup不能重设
  修正: schedpolicies 加入的标签没有传入 params，导致动态标签不生效
  fix deploy file
  webconsole: append protocol params for each connParams
 2019-03-22 16:30:23 +08:00
邱剑 67dc84ac1d Automatic merge from release/2.8.0 -> master 
* commit '7c8ea8fae9035fb5757c9bb2685e45b3d4e355f7':
  避免default secgroup不能重设
  修正: schedpolicies 加入的标签没有传入 params，导致动态标签不生效
  fix deploy file
  webconsole: append protocol params for each connParams
 2019-03-22 16:30:23 +08:00
Zexi Li 7707985a8c Merge branch 'release/2.7.0' of ssh://git.yunion.io/~lizexi/onecloud into hotfix/lzx-resolve-conflict-2.8.0-2019032201 2019-03-22 16:29:27 +08:00
邱剑 cd84b61b67 Merge pull request #1309 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-guest-default-secgroup to release/2.7.0 
* commit '837ae0cd16185fd7800cbfe67ef48da033772eb9':
  避免default secgroup不能重设
 2019-03-22 16:21:00 +08:00
邱剑 133978296d Merge pull request #1311 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-resolve-conflict-2.8.0-20190322 to release/2.8.0 
* commit '4a9477b9d7eac0f4dca199e6c5cad133c86c62de':
  resolve conflict
 2019-03-22 16:02:28 +08:00
邱剑 e54260e9a0 Automatic merge from release/2.8.0 -> master 
* commit '133978296d7d2099aa29f3b936695a222c1df13e':
  resolve conflict
 2019-03-22 16:02:28 +08:00
Zexi Li 4a9477b9d7 resolve conflict 2019-03-22 15:59:42 +08:00
邱剑 94344ca41e Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '818f9870e6cc22f46411c85e7f6e722cbca80aeb':
  webconsole: append protocol params for each connParams
 2019-03-22 15:47:55 +08:00
邱剑 818f9870e6 Merge pull request #1296 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feautre/lzx-webconsole-opt to release/2.6.0 
* commit '5e2760ef13e12f222459ae808048de36f6bad120':
  webconsole: append protocol params for each connParams
 2019-03-22 15:47:54 +08:00
邱剑 1498ddfedb Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '36603a6aaa03a598bfb7a85ac9bc64bce24719ee':
  fix deploy file
 2019-03-22 15:47:22 +08:00
邱剑 36603a6aaa Merge pull request #1302 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/minor-fix-0321 to release/2.6.0 
* commit 'a004e163a4edc7ad92787657818ed956d8427f63':
  fix deploy file
 2019-03-22 15:47:22 +08:00
邱剑 d1406526d3 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '1ae5cf6b33ebe77a262f411ad4e52871c0d51b3f':
  修正: schedpolicies 加入的标签没有传入 params，导致动态标签不生效
 2019-03-22 15:35:54 +08:00
邱剑 1ae5cf6b33 Merge pull request #1308 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-sched-policy-not-work to release/2.6.0 
* commit 'e5b5a33c1e8a84415de9451dcb5e96c2214565a4':
  修正: schedpolicies 加入的标签没有传入 params，导致动态标签不生效
 2019-03-22 15:35:53 +08:00
屈轩 837ae0cd16 避免default secgroup不能重设 2019-03-22 15:21:53 +08:00
Zexi Li e5b5a33c1e 修正: schedpolicies 加入的标签没有传入 params，导致动态标签不生效 2019-03-22 12:12:11 +08:00
李泽玺 2be5b536d1 Merge pull request #1307 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-metadata-permission to release/2.8.0 
* commit '56f8d57428162d692bbd4cb0fb41382834eb4c0e':
  添加普通用户查看metadata权限
 2019-03-22 11:55:59 +08:00
李泽玺 e1412b791e Automatic merge from release/2.8.0 -> master 
* commit '2be5b536d120883e92dc8ace57747e97bc9a0d4f':
  添加普通用户查看metadata权限
 2019-03-22 11:55:59 +08:00
屈轩 56f8d57428 添加普通用户查看metadata权限 2019-03-22 11:54:33 +08:00
李泽玺 f972a37757 Merge pull request #1306 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-metadata-sql-fix to release/2.8.0 
* commit '4ee31813b4fcb653b95abc195841715b336bf8e6':
  避免mysql _ 是特殊字符问题
 2019-03-22 11:37:11 +08:00
李泽玺 e5ce445236 Automatic merge from release/2.8.0 -> master 
* commit 'f972a3775788e8686cbae0c0cd99c7feebbd89a8':
  避免mysql _ 是特殊字符问题
 2019-03-22 11:37:11 +08:00
屈轩 4ee31813b4 避免mysql _ 是特殊字符问题 2019-03-22 11:35:41 +08:00
张东亮 e5a475e6e1 Merge pull request #1305 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-create-input-keypair-secgrp to release/2.8.0 
* commit '6147f7d7d1dc1f246d139c1990447774d479f8a3':
  fix: climc server-create input keypair missing
 2019-03-22 10:43:10 +08:00
张东亮 a3a90d1566 Automatic merge from release/2.8.0 -> master 
* commit 'e5a475e6e1c93bfc9a0cdc39d06553ff0d032011':
  fix: climc server-create input keypair missing
 2019-03-22 10:43:10 +08:00
Zexi Li 6147f7d7d1 fix: climc server-create input keypair missing 2019-03-22 10:40:35 +08:00
wanyaoqi a004e163a4 fix deploy file 2019-03-22 10:34:52 +08:00
邱剑 922e224e68 Merge pull request #1304 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-create-input-keypair-secgrp to release/2.8.0 
* commit '18db5cbc325a43875464b2f39a07b95bbcab39af':
  fix: ServerCreateInput keypair and secgroup wrong json tag
 2019-03-22 09:17:14 +08:00
Zexi Li 18db5cbc32 fix: ServerCreateInput keypair and secgroup wrong json tag 2019-03-22 09:20:39 +08:00
邱剑 0c47055cee Automatic merge from release/2.8.0 -> master 
* commit '922e224e685e36a22b6ba9caa0f76bec162fc89d':
  fix: ServerCreateInput keypair and secgroup wrong json tag
 2019-03-22 09:17:14 +08:00
邱剑 24cc34db5f Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '1264320ba18ab431138f8c102ed0433782e2eb88':
  feature: aliyuncli support upload directory
  CI: use drone 1.0 pipeline
 2019-03-21 23:54:47 +08:00
邱剑 1264320ba1 Merge pull request #1301 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-aliyuncli-support-upload-dir to release/2.6.0 
* commit 'd1f87abb19fed0ac5f0e4779c7f9f62394d3b72d':
  feature: aliyuncli support upload directory
 2019-03-21 23:54:47 +08:00
邱剑 d6a19ca766 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '24cc34db5f43fbc148c5dcb1b169eeb4e6e9f9ab':
  feature: aliyuncli support upload directory
  CI: use drone 1.0 pipeline
 2019-03-21 23:54:47 +08:00
邱剑 59e376f088 Automatic merge from release/2.8.0 -> master 
* commit 'd6a19ca766882cc8bb31a9ca334044d1ee10efab':
  feature: aliyuncli support upload directory
  CI: use drone 1.0 pipeline
 2019-03-21 23:54:47 +08:00
邱剑 947e597b59 Merge pull request #1303 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-aws-create-fail to release/2.8.0 
* commit 'f15bebe3130e8059c7e18c90b5e80133077e3686':
  aws create bugfix
 2019-03-21 22:57:43 +08:00