opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 15:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,767 Commits 30 Branches 714 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph
1636 Commits
Author SHA1 Message Date
屈轩 2583b4ed83 避免续费时未刷新虚拟机状态 2019-03-29 18:36:43 +08:00
屈轩 a6987b3cb8 使用控制台名称作为同步名称 2019-03-29 16:34:39 +08:00
Qiu Jian 004d9b6f95 update copyright headers of all source 2019-03-29 14:47:48 +08:00
屈轩 a595427f12 prefer using keypair not password (#66) 2019-03-28 15:52:04 +08:00
TangBin 892f96dc91 aws not found error fix 2019-03-27 20:15:52 +08:00
屈轩 3866a09915 避免err为nil时指针访问异常 2019-03-27 17:40:15 +08:00
TangBin dbf2048e15 ucloud add method GetSecurityGroupIds 2019-03-27 13:40:13 +08:00
周有松 90598a6a07 Merge pull request #1277 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-ucloud-sync to release/2.8.0 
* commit '5694a7495e160541ef41787c923901cda3589020':
  add ucloud hypervisor
  add ucloud vnc info
  storage fix
  DoListAll func add comment
  network start&end ip fix
  fix ucloud sync comment
  ucloud sync
 2019-03-26 21:09:38 +08:00
周有松 43b09aae3d Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '0cce83b9469bd8bdade266ce7b2a0c57eccc3ba4':
  避免部分公有云续费后过期时间更新慢问题导致平台未能设置正常的过期时间
 2019-03-26 21:03:20 +08:00
周有松 0cce83b946 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'a9040917e58d0cd2042a7aa1973fd965dfa0fba6':
  避免部分公有云续费后过期时间更新慢问题导致平台未能设置正常的过期时间
 2019-03-26 21:03:19 +08:00
周有松 a9040917e5 Merge pull request #1333 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-renew-expire-time to release/2.6.0 
* commit 'd1065ad97e1ec3d6a614ca1f518ce8bbc8245649':
  避免部分公有云续费后过期时间更新慢问题导致平台未能设置正常的过期时间
 2019-03-26 21:03:19 +08:00
屈轩 d1065ad97e 避免部分公有云续费后过期时间更新慢问题导致平台未能设置正常的过期时间 2019-03-26 19:43:36 +08:00
李泽玺 87478f4954 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '60aae0b672073eecd0ab12c91cc6c1d8fbc26920':
  + ACT_DELOCATE
 2019-03-26 18:47:59 +08:00
李泽玺 958d2aa988 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '87478f4954c7e5a19b69f8bb69850524b2de0774':
  + ACT_DELOCATE
 2019-03-26 18:47:59 +08:00
Zhang Dongliang 46f68df060 + ACT_DELOCATE 2019-03-26 18:46:46 +08:00
TangBin a46c8c02cc add ucloud vnc info 2019-03-26 18:46:03 +08:00
wanyaoqi 51b40e9ade Merge branch 'release/2.7.0' into release/2.8.0 2019-03-26 18:08:04 +08:00
张东亮 7afce01220 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'ed7a8232e1baf6b0765a2145523706e327c3e611':
  梳理 logclient 事件，增加黑名单
 2019-03-26 17:56:38 +08:00
Zhang Dongliang 8a0b325302 梳理 logclient 事件，增加黑名单 2019-03-26 17:53:12 +08:00
Yousong Zhou ad9c11a7a3 Merge remote-tracking branch 'origin/release/2.7.0' into bugfix/yousong-merge-conflic-1329 2019-03-26 08:45:40 +00:00
周有松 5967461f11 Merge pull request #1266 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-security-group-sync to release/2.7.0 
* commit '39f971ae29d42526512455014b342b4ce9e4d022':
  更新vendor
  更新参数名称
  支持过滤未关联某个安全组的虚机列表
  完成安全组同步代码重构
 2019-03-26 15:49:30 +08:00
周有松 739ccd9f0f Merge pull request #1324 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-aws-get-instance-not-relay-on-get-images to release/2.8.0 
* commit 'f4fe2ba45f17d44d0155119c1928f969c9185dde':
  fix: adjust cloudaccount list columns
  fix: sync project may sync empty project ID
  fix: AWS getinstances failed because of missing AMI ID
 2019-03-26 12:12:53 +08:00
邱剑 22e227989e Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '3906a745866a5c3035112f1b0a845c075e8a583a':
  openstackcli:修复参数缺失bug
 2019-03-25 19:40:27 +08:00
邱剑 47d355c5bf Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '22e227989e03f6b1122644c10cb51829232593f0':
  openstackcli:修复参数缺失bug
 2019-03-25 19:40:27 +08:00
屈轩 e9d53e0c59 openstackcli:修复参数缺失bug 2019-03-25 17:47:33 +08:00
Qiu Jian 8f679a6932 fix: AWS getinstances failed because of missing AMI ID 2019-03-25 12:23:06 +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
屈轩 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
邱剑 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
邱剑 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
Qiu Jian f91d85337e fix: aws sync metadata ignoring errors 2019-03-22 22:54:30 +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
Qiu Jian d1f87abb19 feature: aliyuncli support upload directory 2019-03-21 20:28:55 +08:00
TangBin b046c7cf31 storage fix 2019-03-21 19:56:34 +08:00
TangBin 37cc23a28f fix confilct 2019-03-21 17:57:36 +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
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 06ae94ebe3 fix: simplify rbac policy condition to match projects and roles 2019-03-21 01:03:51 +08:00
TangBin 5c724d0067 fix conflict 2019-03-20 15:18:35 +08:00
Qiu Jian a93968e0d2 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 14:37:37 +08:00
TangBin fc353606a9 DoListAll func add comment 2019-03-20 14:34:14 +08:00
TangBin 04e3e2458c network start&end ip fix 2019-03-20 14:30:50 +08:00