opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-29 17:58:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,672 Commits 30 Branches 712 Tags
5e4ac465d563c2628348564cda3f001df09eeac1
Commit Graph
3675 Commits
Author SHA1 Message Date
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
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
屈轩 837ae0cd16 避免default secgroup不能重设 2019-03-22 15:21:53 +08:00
Zexi Li e5b5a33c1e 修正: schedpolicies 加入的标签没有传入 params，导致动态标签不生效 2019-03-22 12:12:11 +08:00
屈轩 56f8d57428 添加普通用户查看metadata权限 2019-03-22 11:54:33 +08:00
屈轩 4ee31813b4 避免mysql _ 是特殊字符问题 2019-03-22 11:35:41 +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
邱剑 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
邱剑 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
tangbin f15bebe313 aws create bugfix 2019-03-21 22:56:04 +08:00
Qiu Jian d1f87abb19 feature: aliyuncli support upload directory 2019-03-21 20:28:55 +08:00
邱剑 715a7f5e81 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'efd0b207dce8e128bf59244c95f962f771d0565d':
  normalizeProvider fix
  skus query fix
 2019-03-21 20:00:58 +08:00
邱剑 efd0b207dc Merge pull request #1290 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-sku-fix to release/2.7.0 
* commit '4bbf5ddd8c50fa9d729cda9fbb49aee3c921e35a':
  normalizeProvider fix
  skus query fix
 2019-03-21 20:00:58 +08:00
TangBin 4bbf5ddd8c normalizeProvider fix 2019-03-21 19:59:24 +08:00
TangBin b046c7cf31 storage fix 2019-03-21 19:56:34 +08:00
邱剑 d573c041ef Merge pull request #1289 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-metadata-fix to release/2.8.0 
* commit '6eacd8196c26239a6c53a6192d19f4138edb17cb':
  不截断系统metadata key
 2019-03-21 18:37:47 +08:00
TangBin 37cc23a28f fix confilct 2019-03-21 17:57:36 +08:00
Zexi Li 5e2760ef13 webconsole: append protocol params for each connParams 2019-03-21 17:55:27 +08:00
屈轩 6eacd8196c 不截断系统metadata key 2019-03-21 17:09:50 +08:00
Zexi Li 38da40461d scheduler: server sku predicate 2019-03-21 16:44:09 +08:00
邱剑 07304221c0 Merge pull request #1293 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-rbac-simplify-condition to release/2.6.0 
* commit '78faed91a4ee0ebda6608f55bc6ae924195df0e3':
  fix: SyncOnce should invalidate policy cache
  fix: refine policy match conditions
  minor updates
  fix: simplify rbac policy condition to match projects and roles
 2019-03-21 11:31:11 +08:00
邱剑 430df17dd3 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '07304221c0e4f4fa1f75438d24a8feece7202c9f':
  fix: SyncOnce should invalidate policy cache
  fix: refine policy match conditions
  minor updates
  fix: simplify rbac policy condition to match projects and roles
 2019-03-21 11:31:11 +08:00
邱剑 2310be389b Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '430df17dd3cefe0f25328ce69bf8d8b0d0e95253':
  fix: SyncOnce should invalidate policy cache
  fix: refine policy match conditions
  minor updates
  fix: simplify rbac policy condition to match projects and roles
 2019-03-21 11:31:11 +08:00
Qiu Jian 78faed91a4 fix: SyncOnce should invalidate policy cache 2019-03-21 11:29:30 +08:00
邱剑 5de1178b97 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'd7c587bf4b4ffe939a408707225af52c2859ab33':
  fix: 1. vmware detch disk logic error 2. host add storage commit_rate 3. host enable netif failed if a fake ipaddr is given
 2019-03-21 11:00:13 +08:00
Qiu Jian cc30b585e0 fix: refine policy match conditions 2019-03-21 10:16:55 +08:00
邱剑 5061aaa23e Merge pull request #1288 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/server-filter-by-vpc to release/2.8.0 
* commit '786db8f87f272d619f3fb3ede853b8c86fca371b':
  fix secgroup find by id or name
 2019-03-21 10:09:38 +08:00
Qiu Jian 58bb26c77f Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20190321-2.7.0 
Conflicts:
	pkg/compute/guestdrivers/base.go
 2019-03-21 01:09:08 +08:00
Qiu Jian 9d966e9959 minor updates 2019-03-21 01:06:33 +08:00
Qiu Jian 06ae94ebe3 fix: simplify rbac policy condition to match projects and roles 2019-03-21 01:03:51 +08:00
邱剑 273694b875 Merge pull request #1286 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-vmware-detch-disk-logic-and-other-misc to release/2.6.0 
* commit 'a93968e0d2590a3cad7ee3eccc248e6ef7ddc13c':
  fix: 1. vmware detch disk logic error 2. host add storage commit_rate 3. host enable netif failed if a fake ipaddr is given
 2019-03-20 22:20:51 +08:00
邱剑 0cb39ba521 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '6c4f42d3806ebc95574977fcfa37989e5fcf1242':
  fix live migrate set status
 2019-03-20 22:20:41 +08:00
邱剑 6c4f42d380 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'b94d716af8292e001b55f34560559274c56cccb3':
  fix live migrate set status
 2019-03-20 22:20:41 +08:00
邱剑 b94d716af8 Merge pull request #1287 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/minor-fix0320 to release/2.6.0 
* commit '0a45a1d8a176b0db04abf989086a37d8ec3525b7':
  fix live migrate set status
 2019-03-20 22:20:40 +08:00
wanyaoqi 0a45a1d8a1 fix live migrate set status 2019-03-20 20:12:56 +08:00
Zexi Li 1ed92bd176 fix: gpu server not work 2019-03-20 20:07:43 +08:00
TangBin bd9c8ca780 skus query fix 2019-03-20 16:28:51 +08:00
wanyaoqi 786db8f87f fix secgroup find by id or name 2019-03-20 15:44:48 +08:00
TangBin 5c724d0067 fix conflict 2019-03-20 15:18:35 +08:00
邱剑 e211643333 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '648875e7b7319dcb9e9a4d1ee6c65fe83a071c05':
  fix: make virtual interface pointer more general
  fix: 1. abstract baseagent, 2. extend baseagent to baremetalagent
 2019-03-20 15:10:41 +08:00
邱剑 648875e7b7 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '4213db3eb605217796850dd42a266dd0372a7e85':
  fix: make virtual interface pointer more general
  fix: 1. abstract baseagent, 2. extend baseagent to baremetalagent
 2019-03-20 15:10:41 +08:00