Commit Graph
6987 Commits
Author SHA1 Message Date
屈轩 aceb20bf79 支持一次性绑定多个安全组 2018-12-12 16:38:18 +08:00
TangBin 779a588bcf make fmt 2018-12-12 15:43:13 +08:00
TangBin e00a2005f2 Merge branch 'release/2.4.0' into feature/tb-skus-support-private-cloud 2018-12-12 15:41:59 +08:00
TangBin cb0823eb70 name bugfix 2018-12-12 15:41:22 +08:00
邱剑 8f2a03e793 Automatic merge from release/2.3.0 -> release/2.4.0
* commit '3608ea66742a0507060768bf7eb4f41d75595a32':
  loadbalancerlisteners: 改正rps update
2018-12-12 15:37:13 +08:00
Yousong Zhou 432bab6fa5 loadbalancerlisteners: 改正rps update 2018-12-12 07:35:40 +00:00
邱剑 2f325530ef Automatic merge from release/2.3.0 -> release/2.4.0
* commit 'ec71bc2fe99668a49fa2cc1b92413798cf6bec4a':
  loadbalancers: 增加rps限速支持
  loadbalancers: 清理监听选项名
  loadbalancers: 移除Bandwidth字段
2018-12-12 15:32:47 +08:00
邱剑 ec71bc2fe9 Merge pull request #725 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:feature/yousong-lb-ratelimit to release/2.3.0
* commit '5564929e349985f4c0ddbd07f13ebf7aa23f9dbc':
  loadbalancers: 增加rps限速支持
  loadbalancers: 清理监听选项名
  loadbalancers: 移除Bandwidth字段
2018-12-12 15:32:47 +08:00
邱剑 5943754e7f Automatic merge from release/2.3.0 -> release/2.4.0
* commit '5e94bdded3422e217d0ac6803ccb26b6794eebf7':
  project删除bufix
2018-12-12 15:11:29 +08:00
邱剑 fad903ce33 Automatic merge from release/2.0.0 -> release/2.1.0
* commit '3774ae91700bc04b21440aaf9816d77b1a93e0e5':
  project删除bufix
2018-12-12 15:11:28 +08:00
邱剑 29300936d4 Automatic merge from release/2.1.0 -> release/2.2.0
* commit 'fad903ce33e7f2da0727b6f2823db500bc06e30a':
  project删除bufix
2018-12-12 15:11:28 +08:00
邱剑 5e94bdded3 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '29300936d4065aac04587a3d3ffc5de0e143c8c7':
  project删除bufix
2018-12-12 15:11:28 +08:00
唐斌 fad845cd48 Automatic merge from release/2.3.0 -> release/2.4.0
* commit 'c37f1621822136e10ba2ada0093758be630736f8':
  修复capabilities接口hypervisors为空引发的异常
  修复capabilities接口hypervisors为空引发的异常
2018-12-12 15:09:52 +08:00
唐斌 c37f162182 Automatic merge from release/2.2.0 -> release/2.3.0
* commit 'eb4dcfb63cfdafcdd733b70eadb3ab0e204c009f':
  修复capabilities接口hypervisors为空引发的异常
  修复capabilities接口hypervisors为空引发的异常
2018-12-12 15:09:52 +08:00
TangBin c3a5afd88e 修复capabilities接口hypervisors为空引发的异常 2018-12-12 15:09:03 +08:00
TangBin 68249b00d7 project删除bufix 2018-12-12 15:06:09 +08:00
TangBin 953da6e348 修复capabilities接口hypervisors为空引发的异常 2018-12-12 14:41:55 +08:00
邱剑 0be138c10e Merge pull request #729 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-make-host-resource-type-optional to release/2.4.0
* commit 'a5dfe342a1462a2dcb9d108ba53cf5fb62a9ab4e':
  将host resource type设置为create_optional,且default为shared
2018-12-12 13:15:21 +08:00
李泽玺 ce3d1368c2 Merge pull request #728 in YUNIONIO/onecloud from ~ZHENGJIAJIE/onecloud:feature/add-bill-detail-api to release/2.4.0
* commit '31cb423a2f8442a1385a6f0c87e4a0bec4062e74':
  zhengjj add files
2018-12-12 12:02:29 +08:00
Qiu Jian a5dfe342a1 将host resource type设置为create_optional,且default为shared 2018-12-12 11:59:31 +08:00
zhengjiajie 31cb423a2f zhengjj add files 2018-12-12 11:53:45 +08:00
Yousong Zhou 5564929e34 loadbalancers: 增加rps限速支持 2018-12-12 03:44:30 +00:00
wanyaoqi ad2de33846 fix code 2018-12-12 11:38:09 +08:00
TangBin dd2ce41fa2 skus list bugfix 2018-12-12 11:15:30 +08:00
Qiu Jian 0cc221e78a Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-region-geographicinfo 2018-12-12 09:20:39 +08:00
Qiu Jian 4bd67d60ee 修正:由于datastore url信息不一致导致通过vcenter创建主机失败 2018-12-12 01:23:48 +08:00
Qiu Jian 5d5b9c8c85 增加:1. region的区域信息 2. 完善host的公有云账号信息 2018-12-12 00:09:07 +08:00
Yousong Zhou 93e1e7799e loadbalancers: 清理监听选项名 2018-12-11 14:32:27 +00:00
Yousong Zhou 58aca9ea9e loadbalancers: 移除Bandwidth字段
未在使用,且名称太泛,不便于日后扩展维护
2018-12-11 14:32:27 +00:00
TangBin b8f3e6632d update skus climc 2018-12-11 20:55:21 +08:00
wanyaoqi 86b3b38f41 add snapshot reference count, fix code 2018-12-11 20:48:46 +08:00
wanyaoqi 6a6806e65b server create disk by snapshot, mount snapshot by fusefs 2018-12-11 20:46:36 +08:00
邱剑 f537b04ff3 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '8a4badaa095960557acc3bb40314384083314f79':
  阿里云错误处理
2018-12-11 20:22:45 +08:00
邱剑 c836b5e23f Automatic merge from release/2.3.0 -> release/2.4.0
* commit 'f537b04ff31b0d255540cc95b23665d2a049f93c':
  阿里云错误处理
2018-12-11 20:22:45 +08:00
邱剑 ed401039b3 Merge pull request #719 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-aliyun-error-code to release/2.1.0
* commit 'cea2fcb6f38532c37d7ddadcd936b4b70b06b81c':
  阿里云错误处理
2018-12-11 20:22:44 +08:00
邱剑 8a4badaa09 Automatic merge from release/2.1.0 -> release/2.2.0
* commit 'ed401039b38d16546d674b07869e92e40f20ceeb':
  阿里云错误处理
2018-12-11 20:22:44 +08:00
唐斌 c280c5d3e0 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '33e73560b2b17c15701deef474c9106d929e8559':
  delete project bugfix
2018-12-11 19:48:40 +08:00
唐斌 3ad1342f4d Automatic merge from release/2.0.0 -> release/2.1.0
* commit 'f3cc732c6c29278877e3d99c795d4b26c428f343':
  delete project bugfix
2018-12-11 19:48:40 +08:00
唐斌 33e73560b2 Automatic merge from release/2.1.0 -> release/2.2.0
* commit '3ad1342f4ddd79eb3f71ff372150f5b72913b336':
  delete project bugfix
2018-12-11 19:48:40 +08:00
TangBin b3644003a8 delete project bugfix 2018-12-11 19:47:16 +08:00
屈轩 cea2fcb6f3 阿里云错误处理 2018-12-11 19:43:33 +08:00
TangBin 9318bf6683 update sku create & update & list method 2018-12-11 19:36:21 +08:00
TangBin da559be138 update sku create & update & list method 2018-12-11 17:52:28 +08:00
zhengjiajie beec785040 add bill-detail file 2018-12-11 16:29:50 +08:00
邱剑 89527c7b69 Merge pull request #716 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-network-details-routes to release/2.4.0
* commit 'fbbf841494567bd1130ca304577c66e6dbc88e4b':
  region: network details show routes
2018-12-11 11:51:12 +08:00
Zexi Li fbbf841494 region: network details show routes 2018-12-11 11:44:35 +08:00
邱剑 329ac7b5cd Merge pull request #714 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-container-validate-memcpu-failed to release/2.4.0
* commit '2b93c100d92b9a08f8bf8457c746ab38c9b68451':
  region: 修复创建容器时没有 parse vmem_size 单位导致创建失败
2018-12-11 11:35:46 +08:00
Zexi Li 2b93c100d9 region: 修复创建容器时没有 parse vmem_size 单位导致创建失败 2018-12-11 11:12:07 +08:00
邱剑 dcb4f12700 Merge pull request #712 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-app-params-turnoff-log-for-specific-action to release/2.4.0
* commit 'd8e35fb11a3d12f18484d8694fe9cdca93edf926':
  context中增加SAppParams参数,允许在Modal的方法里访问http请求参数,也能控制是否日志和trace
2018-12-11 11:00:51 +08:00
邱剑 5ad6d96718 Merge pull request #710 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-policy-cache to release/2.4.0
* commit 'c33fb7e283fcde9a17c232110befc9ce1ed877ac':
  updates
  minor fixes
  增加policy缓存,降低日志量和计算量
2018-12-11 11:00:05 +08:00