opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 23:41:47 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,814 Commits 30 Branches 714 Tags
563e637ce40625f22a69ce3a0a05efefd0fc8def
Commit Graph
2432 Commits
Author SHA1 Message Date
邱剑 563e637ce4 Merge pull request #967 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-make-cachedimages-default-user-listable to release/2.6.0 
* commit 'd1b9f1f5c62d57cfd142efe2cfbceab0d0309a35':
  允许普通用户获取cachedimages列表
 2019-01-24 13:42:03 +08:00
邱剑 05f1a1c5b7 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '383194aa6b10150b916a86480b9b5fdff01fda1b':
  避免同步时出现多个loadbalancer network
 2019-01-24 12:19:24 +08:00
邱剑 383194aa6b Merge pull request #964 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-loadbalancer-network to release/2.5.0 
* commit 'd9e92edade392b88a653e1371243631a652ffc4b':
  避免同步时出现多个loadbalancer network
 2019-01-24 12:19:24 +08:00
邱剑 0e8d737312 Merge pull request #949 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-huawei-stage-2 to release/2.6.0 
* commit '9007c966cf69947f95343ea1b1c33d1d5ff32df3':
  fix comment
  add instance price key
  add more comment
  huaweicli support unsubscirbe instance
  huawei support stage 2
 2019-01-24 11:57:21 +08:00
TangBin 9007c966cf fix comment 2019-01-24 11:56:25 +08:00
Qiu Jian d1b9f1f5c6 允许普通用户获取cachedimages列表 2019-01-23 21:25:44 +08:00
邱剑 fd6260aeb8 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '3c48686318d232bf4d13f610861f0b7f6f9206cf':
  add cmd loadbalancer-network-list
  minor fixes
  修正：由于阿里云网络与SNAT关联，导致无法删除
 2019-01-23 19:49:27 +08:00
屈轩 d9e92edade 避免同步时出现多个loadbalancer network 2019-01-23 16:08:01 +08:00
Qiu Jian cd0247f1a8 add cmd loadbalancer-network-list 2019-01-23 14:51:57 +08:00
Qiu Jian 1accd79348 minor fixes 2019-01-23 14:38:14 +08:00
Qiu Jian a035a0efb3 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-fix-aliyun-network-fail-to-delete 2019-01-23 14:24:05 +08:00
唐斌 df882914c7 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'e38e2f9f86e42405a869764e27647295bf896cb2':
  update aws secrule sync
 2019-01-23 11:45:30 +08:00
唐斌 e38e2f9f86 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'b63e32a8d467a9faa4fae7763c7787831752fd14':
  update aws secrule sync
 2019-01-23 11:45:29 +08:00
唐斌 b63e32a8d4 Merge pull request #951 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-aws-update-secrule to release/2.4.0 
* commit 'c3c86c36e58c2721a2b519bc60f3f7d96da3f3d3':
  update aws secrule sync
 2019-01-23 11:45:29 +08:00
万垚奇 afeb0d3108 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '7690cefbc7ffc6070a2d1b51c47261699ab1cf7d':
  mark zone as enabled at initlization
 2019-01-23 11:31:59 +08:00
万垚奇 7690cefbc7 Merge pull request #961 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-put-disabled-zone-enabled to release/2.5.0 
* commit '36ca973f1a1b39b57c45253c945260dd3f2927ae':
  mark zone as enabled at initlization
 2019-01-23 11:31:59 +08:00
TangBin d0bb6a894d merge release/2.6.0 2019-01-23 11:14:39 +08:00
Qiu Jian 36ca973f1a mark zone as enabled at initlization 2019-01-23 09:50:10 +08:00
Qiu Jian 6ae353ea2d Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-fix-aliyun-network-fail-to-delete 2019-01-23 00:09:22 +08:00
邱剑 53211bdb46 Merge pull request #950 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-create-server-with-native-images to release/2.6.0 
* commit '9df351b5f9b8788e9ff43577816c551df8ac3567':
  make fmt import
  minor fixes for vmware
  补充esxi相关功能
  fixes for qcloud&azure
  改进：获取azure官方镜像， 还缺少使用azure官方镜像创建主机的支持
  增加：1. 将公有云标准镜像同步到本地 2. 可以从公有云标准镜像创建主机 3. 在公有云缓存镜像时遵守公有云镜像的配额
 2019-01-23 00:07:33 +08:00
Qiu Jian 9df351b5f9 make fmt import 2019-01-23 00:06:07 +08:00
Qiu Jian e92330a0ac minor fixes for vmware 2019-01-22 23:59:41 +08:00
Qiu Jian 77504c35f6 补充esxi相关功能 2019-01-22 23:30:31 +08:00
邱剑 5ce794b5f6 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '5a11f0ccb4cc20d416e0bcfb269f3c35b2ef946c':
  统一返回resp error
 2019-01-22 23:06:17 +08:00
邱剑 5a11f0ccb4 Merge pull request #954 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-httputils to release/2.5.0 
* commit 'fd9446a866943e7a7346fa548628eec11ca0216d':
  统一返回resp error
 2019-01-22 23:06:16 +08:00
邱剑 270f73401c Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '38fd889684494cbfeaf7ae3fcc61c1c9395da62f':
  补充同步lb network
 2019-01-22 22:59:18 +08:00
邱剑 38fd889684 Merge pull request #957 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-lb-network to release/2.5.0 
* commit 'b863ea6d32ab715e88a82a70635fc981a7b219dc':
  补充同步lb network
 2019-01-22 22:59:18 +08:00
Qiu Jian 4e3d9a7cf0 fixes for qcloud&azure 2019-01-22 22:53:43 +08:00
屈轩 b863ea6d32 补充同步lb network 2019-01-22 16:51:16 +08:00
邱剑 fe55edd794 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '7934c01e08d9cb85013dfcde2caa7e1bda486488':
  避免project未找到直接返回err
 2019-01-22 16:30:35 +08:00
屈轩 b9dd5052ca 冲突解决 2019-01-22 16:29:08 +08:00
邱剑 6f732d1edc Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '0aafe01ee8d8934f54b75b1c2366c5dd72857101':
  避免project未找到直接返回err
 2019-01-22 16:18:37 +08:00
屈轩 3e4b8fed08 避免project未找到直接返回err 2019-01-22 16:17:10 +08:00
邱剑 562de369a2 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'f552befc8f28c181ba899d403e9f2cb889abb946':
  fix account confilct
 2019-01-22 16:05:42 +08:00
TangBin aec2078552 fix account confilct 2019-01-22 15:51:32 +08:00
屈轩 fd9446a866 统一返回resp error 2019-01-22 13:44:49 +08:00
Qiu Jian c5343a111b 修正：由于阿里云网络与SNAT关联，导致无法删除 2019-01-22 02:46:35 +08:00
Qiu Jian c7f632f98b 改进：获取azure官方镜像， 还缺少使用azure官方镜像创建主机的支持 2019-01-22 00:34:48 +08:00
TangBin c3c86c36e5 update aws secrule sync 2019-01-21 20:27:52 +08:00
TangBin 8ff0c8cf38 add instance price key 2019-01-21 14:55:45 +08:00
TangBin e1f54c7e14 add more comment 2019-01-21 11:23:23 +08:00
Qiu Jian beb2ac66b5 增加：1. 将公有云标准镜像同步到本地 2. 可以从公有云标准镜像创建主机 3. 
在公有云缓存镜像时遵守公有云镜像的配额
 2019-01-21 09:21:02 +08:00
TangBin 4dc2e05a6e huaweicli support unsubscirbe instance 2019-01-19 19:04:05 +08:00
唐斌 919f164f95 huawei support stage 2 2019-01-19 17:58:00 +08:00
Zexi Li 223c6d95a2 修复: webconsole 连接vnc设置 password 的虚拟机 2019-01-19 17:35:59 +08:00
屈轩 6f226e2dfd 补充误删的access_url check 2019-01-19 15:14:50 +08:00
邱剑 bbcea5e8dc Merge pull request #946 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-account to release/2.5.0 
* commit 'b16bc5d2cb39d912696f8503dfa3cc638e42fb8d':
  修复openstack项目及用户名顺序颠倒问题
 2019-01-19 13:21:19 +08:00
屈轩 b16bc5d2cb 修复openstack项目及用户名顺序颠倒问题 2019-01-19 13:18:47 +08:00
屈轩 a1a0445779 避免传递tenant_id和onecloud api冲突 2019-01-19 12:20:45 +08:00
邱剑 e3ddd6a201 Merge pull request #943 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-eip-more-details to release/2.5.0 
* commit '5c55f0633af1a750dbd6e28f6b759991fe3ea467':
  取消重复的region信息
  返回eip账号信息
 2019-01-18 17:22:26 +08:00