opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-04 23:13:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,767 Commits 30 Branches 714 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph
287 Commits
Author SHA1 Message Date
邱剑 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
屈轩 a07ab4c121 初始化model 2018-11-16 15:05:05 +08:00
Qiu Jian 1cb96585bc Merge branch 'release/2.2.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181023-2.3.0 2018-10-23 22:31:47 +08:00
wanyaoqi a3a5259505 add disk type in snapshots 2018-10-23 22:07:04 +08:00
Qiu Jian 352e4816a6 minor fixes 2018-10-18 15:58:09 +08:00
Qiu Jian dfa5a634ab 修正：cloudprovider/cloudacount的代码recode 2018-10-18 12:22:50 +08:00
Qiu Jian 23443c07bc 修正：1. 阿里云自动设置Import/Export image ram授权，不再需要手动授权 2. 
修正公有云注入userdata的问题
 2018-10-13 20:36:15 +08:00
Qiu Jian 17175bc0a4 改进：1. 部署VM时注入全局和项目公钥 2. 完善keypair的创建和导入功能 3. 
其他
 2018-10-11 23:04:42 +08:00
邱剑 ec7f2ee981 Merge pull request #272 in YUNIONIO/onecloud from ~QUXUAN/onecloud:release/2.2.0 to release/2.2.0 
* commit '7c217bc49d7525050f73a87ec73866a642849be4':
  避免/tmp目录容量不够
 2018-09-30 12:13:34 +08:00
屈轩 7c217bc49d resolve conflict 2018-09-30 12:10:58 +08:00
屈轩 3eea07f279 避免/tmp目录容量不够 2018-09-30 11:55:15 +08:00
屈轩 072c4b8a1f 全量同步时默认不创建默认resourcegroup,延迟到创建资源时创建 2018-09-27 10:20:43 +08:00
屈轩 c753e36f74 resolve conflict 2018-09-20 16:25:46 +08:00
屈轩 03a80615cc resolve conflict 2018-09-19 22:02:01 +08:00
wanyaoqi bd7010b9e2 aliyun snapshot sync, create, delete; disk reset 2018-09-18 21:51:38 +08:00