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
邱剑 7d4309fb69 Merge pull request #590 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-nic-storage to release/2.3.0 
* commit 'fbc3fc5889cc93f96506555f9b4ea2d4ae8289b3':
  补充同步腾讯云安全组规则
  修正赋值顺序
  添加disk hypervisor
  关联安全组
  私网IP同步及storage名称统一小写
 2018-11-29 12:28:49 +08:00
屈轩 39bde25db5 冲突解决 2018-11-29 12:21:38 +08:00
屈轩 3d76a82d78 删除虚拟机时避免无限循环 2018-11-29 11:38:30 +08:00
屈轩 fbc3fc5889 补充同步腾讯云安全组规则 2018-11-28 18:43:09 +08:00
屈轩 48974ebd48 修正赋值顺序 2018-11-28 16:52:06 +08:00
屈轩 87a1cce5eb 添加disk hypervisor 2018-11-28 16:50:20 +08:00
屈轩 46a4cbd4a4 关联安全组 2018-11-28 16:47:04 +08:00
屈轩 396da0de61 私网IP同步及storage名称统一小写 2018-11-28 16:04:22 +08:00
Qiu Jian aaaba6002f fix aliyun fail to attach disk after create disk 2018-11-26 23:21:11 +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
邱剑 411195176d Merge pull request #555 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-secgroup-sync to release/2.2.0 
* commit '5dc063ee40b60dbbce48cc036053e2171dace8e1':
  初始化model
 2018-11-26 13:47:04 +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 c398301eba fix aliyun error code handling changes, use error message string to 
check message type
 2018-11-26 02:58:51 +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
Yousong Zhou cd0a1b87ef aliyun: add SVpc.apiRequest() method 2018-11-23 03:17:41 +00:00
Yousong Zhou 7e7f124efe aliyun: region: rename ecsClient to sdkClient 2018-11-23 03:17:41 +00:00
Yousong Zhou 0ae3ebdb6c aliyun: rename jsonRequest to ecsRequest 2018-11-23 03:17:41 +00:00
邱剑 ec85bb02db Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'b16f6192e3d47fc4e6df9a9db64460655f327f9d':
  兼容从2.3.0降级到2.2.0
 2018-11-22 21:38:23 +08:00
屈轩 e1284e60cd rebase 2018-11-22 21:24:39 +08:00
屈轩 e6d68a947c 兼容从2.3.0降级到2.2.0 2018-11-22 21:21:41 +08:00
邱剑 f86b2e280b Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'adac6594f41ea55ac3979f930087e9ecac54a1e0':
  补充Azure disk metadata
 2018-11-22 20:24:20 +08:00
邱剑 adac6594f4 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '531e0b3c842dfe238fe006a24ba14b7ef758b9f1':
  补充Azure disk metadata
 2018-11-22 20:24:18 +08:00
屈轩 78cede69e5 补充Azure disk metadata 2018-11-22 20:23:00 +08: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
邱剑 dc603489b0 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '383264c137b6a2f8d26fa8eb9e005c38a7653301':
  避免因snapshot找不到而删除失败
 2018-11-21 21:52:29 +08:00
邱剑 383264c137 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'd267f92e8e5e74ae8da3e5b4e1de8020694e2310':
  避免因snapshot找不到而删除失败
 2018-11-21 21:52:29 +08:00
邱剑 d267f92e8e Merge pull request #548 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-snapshot-delete to release/2.2.0 
* commit '4f63b4ad587375a9e715e0d80f3b53edc9b6b6b5':
  避免因snapshot找不到而删除失败
 2018-11-21 21:52:28 +08:00
TangBin c5a643d4fd remove useless method 2018-11-20 16:29:52 +08:00
屈轩 4f63b4ad58 避免因snapshot找不到而删除失败 2018-11-20 16:20:29 +08:00
唐斌 322e2a0143 Merge pull request #532 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-support-aws-2 to release/2.4.0 
* commit 'b36f054c8a061403eb9a97b68a59cf60ebb5c110':
  fix confilict
  remove useless log
  rebuild root fix
  make fmt
  rebuild root disk
  return err
  vpc fix
  vpc & securtiy group sync
  add latitude & longitude info
  add more log & fix YunionSecRuleToAws\
  snapshot region id bugfix
  snapshot delete & disk reset
  add more log
  snapshot fix
  detach disk add more log
  disk create fix
 2018-11-20 15:41:20 +08:00
邱剑 4c82faee50 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'd8a52fdf1d82f2d67158939e183b95913a937287':
  priceKey携带region信息
 2018-11-20 11:01:23 +08:00
邱剑 76b65347ca Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '4c82faee501e4346de68b39cfbd11509db7c95ab':
  priceKey携带region信息
 2018-11-20 11:01:23 +08:00
TangBin b36f054c8a Merge branch 'release/2.4.0' into feature/tb-support-aws-2 2018-11-20 10:33:41 +08:00
屈轩 ff5071eba2 priceKey携带region信息 2018-11-19 20:26:24 +08:00
TangBin b7af004286 fix confilct 2018-11-19 15:08:04 +08:00
屈轩 69d38d333a 修复参数缺少问题 2018-11-19 15:04:03 +08:00
邱剑 da6110e4f7 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '8512446cc4b651671df88ec40aa3291ccf99075b':
  服务未注册时，尝试注册服务
 2018-11-19 13:43:49 +08:00
邱剑 b286520af4 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'da6110e4f73add7f4f51bd429653bdedfb1bf635':
  服务未注册时，尝试注册服务
 2018-11-19 13:43:49 +08:00
屈轩 db0f7656aa 服务未注册时，尝试注册服务 2018-11-19 10:28:40 +08:00
TangBin 6b14c8d95f remove useless log 2018-11-17 16:21:31 +08:00
TangBin a49747bebe rebuild root fix 2018-11-17 16:07:06 +08:00
邱剑 079ab3cd20 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'e17ce4f78dcb36b3f85c76347aa09f12af3be115':
  azure使用统一登录用户名
 2018-11-17 13:04:04 +08:00
屈轩 fc0e60c5ec azure使用统一登录用户名 2018-11-17 13:02:10 +08:00
邱剑 4292c68b67 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '0a8d2b532e3200958e4515c995fdb7f17ce962de':
  change yunionroot => cloudroot
 2018-11-17 12:56:19 +08:00