opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,695 Commits 27 Branches 687 Tags
6fccbfcd6e4e9c2d8357259fd5fb3ff1c89b4dff
Commit Graph
101 Commits
Author SHA1 Message Date
Qiu Jian 6fccbfcd6e Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.5.0-20190213 
Conflicts:
	pkg/compute/models/guests.go
	pkg/compute/service/service.go
	pkg/compute/tasks/cloud_provider_sync_info_task.go
 2019-02-13 12:01:01 +08:00
Qiu Jian 173526ce06 fix: correct VM expiration date before clean expired prepaid VM 2019-02-12 01:02:57 +08:00
屈轩 8f65712632 climc 更新 2019-01-18 10:57:36 +08:00
屈轩 b68bbef09d 后端对公有云账号密码信息重组 2019-01-17 16:23:00 +08:00
Qiu Jian f3b85dcb7b 修正：storage增加IsSysDiskStore属性，标示是否支持系统盘创建。阿里云cloud存储不支持系统盘创建 2019-01-15 22:42:55 +08:00
Qiu Jian 34352ae5db Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.5.0-20190107 
Conflicts:
	pkg/util/aliyun/aliyun.go
 2019-01-07 21:39:00 +08:00
Qiu Jian 7660391948 return nil immediately if error is nil 2019-01-07 11:50:42 +08:00
Qiu Jian eef83be10c 修正：1. server detach disk 缺少parentTaskId 2. aliyun 关机后立即 
detachDisk 会出现InvalidOperation.Conflict的错误
 2019-01-06 20:54:49 +08:00
tangbin 764eb09481 merge release/2.5.0 2019-01-01 17:00:23 +08:00
TangBin 3b91a27fc9 huawei cloud sync 2019-01-01 16:21:37 +08:00
邱剑 83a529f234 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'f10b31c0bdee8e6d1f2d4cfa5457d83cc0256f82':
  client session add context
 2018-12-25 15:25:52 +08:00
wanyaoqi 742a67b0f8 client session add context 2018-12-25 13:33:33 +08:00
邱剑 a30b41bebe Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'd4f11ae6dfc8a9d1c53b6f1d98aad05cef9e91cd':
  腾讯云支持余额查询
  cloudaccount增加更多统计信息
  添加cloudaccount项目信息
 2018-12-21 11:08:18 +08:00
Qiu Jian 0566b17f99 Merge branch 'release/2.3.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.4.0-20181220 
Conflicts:
	pkg/compute/models/cloudaccounts.go
 2018-12-21 00:44:42 +08:00
邱剑 e0dbfb7072 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '00d8dba7bda1b63260d1fde8036807463e9ad118':
  限定只允许创建RSA格式密钥
  disk rollback bugfix
  keypair bugfix
 2018-12-18 18:30:51 +08:00
TangBin ed3deb02bc disk rollback bugfix 2018-12-18 16:48:40 +08:00
屈轩 616ce78302 LB 返回参数更新 2018-12-15 14:28:02 +08:00
屈轩 fcdf62a4d6 支持同步公有云负载均衡信息同步 2018-12-15 13:58:18 +08:00
Qiu Jian 8f11b765d9 1. 
对disk/elasticip/networks/snapshot/storages/vpc/wire/routetable/servers等支持manager/account/provider过滤查询
2. 详情增加SCloudProviderInfo信息
 2018-12-12 22:53:13 +08:00
Qiu Jian 5d5b9c8c85 增加：1. region的区域信息 2. 完善host的公有云账号信息 2018-12-12 00:09:07 +08:00
Qiu Jian cc7da24faa Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-vm-resource-pooling 2018-12-10 01:08:09 +08:00
屈轩 43decfbc5f 冲突解决 2018-12-08 18:30:00 +08:00
邱剑 2468a39a1b Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '6c79c66ef849e90bc8867b990c22938b05b5e6f5':
  验证eip更改带宽
 2018-12-08 18:25:51 +08:00
屈轩 c7166bb713 验证eip更改带宽 2018-12-08 18:10:07 +08:00
屈轩 089dd05ba3 Merge branch 'hotfix/qx-validate-eip-change-bandwidth' of ssh://git.yunion.io/~quxuan/onecloud into release/2.4.0 2018-12-08 17:28:29 +08:00
屈轩 4f5e5bac44 验证eip更改带宽 2018-12-08 17:28:08 +08:00
Qiu Jian 965e84ea36 update 2018-12-07 02:57:58 +08:00
Qiu Jian dfb2e0e00c Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-vm-resource-pooling 2018-12-05 18:09:11 +08:00
邱剑 54c05397bb Merge pull request #584 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-guest-secgroups to release/2.4.0 
* commit 'e34e45d00849a2ba9e05f00687c24b5841077e79':
  限制虚机绑定安全组数量
  初始化model
 2018-12-05 14:26:52 +08:00
Qiu Jian 669081f7f3 Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-vm-resource-pooling 2018-12-05 01:14:45 +08:00
Qiu Jian 3e87c17e72 support prepaid server create and renew 2018-12-05 00:40:15 +08:00
邱剑 293a43ee27 Merge pull request #653 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-baremetal-api to release/2.4.0 
* commit '5dceb2685ca3a3c078f303ad8328c90ca43d6c8b':
  region: fix host enable not clean sched cache
  fix BaremetalSyncAllGuestsStatusTask
  region: baremetal api compatible
  region: baremetal api compatible
 2018-12-04 20:44:43 +08:00
屈轩 b0bbfb0f1a 解决冲突 2018-12-04 20:27:12 +08:00
屈轩 3fa55efe42 腾讯云导入镜像适配 2018-12-04 18:50:58 +08:00
李泽玺 3f3f1701c2 Merge pull request #1 in ~LIZEXI/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/fix-BaremetalSyncAllGuestsStatusTask to bugfix/lzx-baremetal-api 
* commit 'ea81fa26dbcb56eefe131387b2fab8c3b731029d':
  fix BaremetalSyncAllGuestsStatusTask
  region: baremetal api compatible
 2018-12-04 18:09:07 +08:00
屈轩 2608e8e6b9 初始化model 2018-12-03 21:12:44 +08:00
TangBin 4cb87d487e fix conflict 2018-11-29 21:37:53 +08:00
TangBin d9d66329dc sync skus table from cloudmeta service && aws bugfix 2018-11-29 20:18:20 +08:00
Qiu Jian 341e4204a0 Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-esxi-support-complete 2018-11-26 21:54:06 +08:00
屈轩 bf06bcdc8a 解决冲突 2018-11-26 16:52:02 +08:00
屈轩 18eedcf82c 解决冲突 2018-11-26 16:42:11 +08:00
屈轩 e98957b337 解决冲突 2018-11-26 16:27:32 +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
Qiu Jian dcbc3daf49 Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-esxi-support-complete 2018-11-25 08:27:09 +08:00
Qiu Jian 94c49ded2e esxi support 2018-11-25 08:21:24 +08:00
Yousong Zhou 593219e010 aliyun: 同步routetables 2018-11-23 03:17:41 +00:00
Qiu Jian d72eb201eb Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-esxi-support-complete 2018-11-21 23:35:47 +08:00
Qiu Jian d36a9f8be5 temp commit 2018-11-21 23:29:35 +08:00
屈轩 0770e52eea 解决冲突 2018-11-16 23:08:29 +08:00
屈轩 503bec34c8 去除不需要接口 2018-11-16 17:59:45 +08:00