opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-31 02:38:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,382 Commits 30 Branches 712 Tags
e1412b791e3f052d4b4b342c01fc57c60ef095cb
Commit Graph
5382 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
李泽玺 e1412b791e Automatic merge from release/2.8.0 -> master 
* commit '2be5b536d120883e92dc8ace57747e97bc9a0d4f':
  添加普通用户查看metadata权限
 2019-03-22 11:55:59 +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
屈轩 56f8d57428 添加普通用户查看metadata权限 2019-03-22 11:54:33 +08:00
李泽玺 e5ce445236 Automatic merge from release/2.8.0 -> master 
* commit 'f972a3775788e8686cbae0c0cd99c7feebbd89a8':
  避免mysql _ 是特殊字符问题
 2019-03-22 11:37:11 +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
屈轩 4ee31813b4 避免mysql _ 是特殊字符问题 2019-03-22 11:35:41 +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
张东亮 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
Zexi Li 6147f7d7d1 fix: climc server-create input keypair missing 2019-03-22 10:40:35 +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
邱剑 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
邱剑 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
邱剑 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
邱剑 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
邱剑 49ad23cb99 Automatic merge from release/2.8.0 -> master 
* commit '947e597b591510757b5d5ed3f1baab1ad10e88a7':
  aws create bugfix
 2019-03-21 22:57:43 +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
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
李泽玺 15706d2155 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'd2f452d36d79d0d142fa2b5a5cdcb742aefac866':
  fix conflict of drone config
 2019-03-21 20:20:11 +08:00
李泽玺 e645acb0ff Automatic merge from release/2.8.0 -> master 
* commit '15706d2155c2054f58c3842874fe6eea66dd2f38':
  fix conflict of drone config
 2019-03-21 20:20:11 +08:00
李泽玺 d2f452d36d Merge pull request #1300 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-fix-conflict-drone to release/2.7.0 
* commit '4ef08fed5a4cea3eca329b142b8349e8fb27ae5c':
  fix conflict of drone config
 2019-03-21 20:20:10 +08:00
Zexi Li 4ef08fed5a fix conflict of drone config 2019-03-21 20:18:51 +08:00
李泽玺 5069841027 Merge pull request #1298 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feautre/lzx-drone-1.0 to release/2.6.0 
* commit '90988e53273d907704a35e3b0c3468d0fc1406db':
  CI: use drone 1.0 pipeline
 2019-03-21 20:14:16 +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
邱剑 7dc2e98a06 Automatic merge from release/2.8.0 -> master 
* commit '715a7f5e81c2f814ff728f7f7ef4d39e42575440':
  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
Zexi Li 90988e5327 CI: use drone 1.0 pipeline 2019-03-21 19:58:25 +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
邱剑 cd55593cc7 Automatic merge from release/2.8.0 -> master 
* commit 'd573c041ef2f7a9796cc94d5d8ce929fe87f319b':
  不截断系统metadata key
 2019-03-21 18:37:47 +08:00
李泽玺 1b0b3d5818 Merge pull request #1295 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-sku-schedule to release/2.8.0 
* commit '38da40461d4a1bce81e5113baafc8951207e9f76':
  scheduler: server sku predicate
 2019-03-21 18:02:06 +08:00
李泽玺 db59129a76 Automatic merge from release/2.8.0 -> master 
* commit '1b0b3d58186c1f33da22ad4140e4f651505f01ad':
  scheduler: server sku predicate
 2019-03-21 18:02:06 +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
邱剑 75ab73f553 Automatic merge from release/2.8.0 -> master 
* commit '2310be389bb8bba864d38de2abd4af2056f70ece':
  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
邱剑 c187117fdd Automatic merge from release/2.8.0 -> master 
* commit '5de1178b97c33ac11c760e107e28bc80f04f2ffa':
  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
邱剑 d7c587bf4b Merge pull request #1294 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-conflict-20190321-2.7.0 to release/2.7.0 
* commit '58bb26c77f05de46e7f394aa047cf00a9c33149d':
  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:12 +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
邱剑 3aba7f748d Automatic merge from release/2.8.0 -> master 
* commit '5061aaa23ec9f0b9608ed9a9241de26e4cceab84':
  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