Commit Graph
365 Commits
Author SHA1 Message Date
wanyaoqi 742a67b0f8 client session add context 2018-12-25 13:33:33 +08:00
Zexi Li 294b382c89 climc: k8s app support create pvc 2018-12-22 17:07:39 +08:00
唐斌 0ee17e3121 Merge pull request #796 in YUNIONIO/onecloud from ~ZHENGJIAJIE/onecloud:feature/add-bill-detail-api to release/2.4.0
* commit '591d2b92b1ded09c4a6ac4584aa6d3861f405573':
  price_info
2018-12-21 10:11:00 +08:00
Zexi Li 314563bd2b fix: rawRequest resp body not close 2018-12-20 17:56:11 +08:00
zhengjiajie 591d2b92b1 price_info 2018-12-20 16:11:21 +08:00
Zexi Li cfe011d6e9 mcclient: region tasks client TaskComplete and TaskFailed 2018-12-19 16:11:21 +08:00
Zexi Li d0e52a7625 climc: k8s support v1.12.3 2018-12-18 17:49:24 +08:00
邱剑 a9f5f5fc36 Merge pull request #780 in YUNIONIO/onecloud from ~ZHENGJIAJIE/onecloud:feature/add-bill-detail-api to release/2.4.0
* commit 'ff3c6eb52623dfc13292e2b5284d9a774224301a':
  zhengjiajie add new files
2018-12-18 17:16:09 +08:00
zhengjiajie ff3c6eb526 zhengjiajie add new files 2018-12-18 16:04:06 +08:00
屈轩 15c2997b88 修改关联多个安全组参数格式 2018-12-17 14:08:51 +08:00
周有松 f1e5d6d99e Automatic merge from release/2.3.0 -> release/2.4.0
* commit '979d28217bb2fdc0929ea1d4c5c587b3728f4735':
  loadbalancercertificates: 变更Certificate字段为list:"user"
  loadbalancercertificates: 变更证书fingerprint字段名和格式
2018-12-15 13:57:13 +08:00
Yousong Zhou 40ed5bc5a6 loadbalancercertificates: 变更证书fingerprint字段名和格式 2018-12-15 04:47:36 +00:00
邱剑 664daa15cb Merge pull request #753 in YUNIONIO/onecloud from ~ZHENGJIAJIE/onecloud:feature/add-bill-detail-api to release/2.4.0
* commit '1ee2e783aab092efb3f34199a36386783a94f382':
  zhengjj submit 4 files
2018-12-14 00:01:24 +08:00
Yousong Zhou 114f7c721e climc: 将xx-list --{provider,manager,account}放到BaseListOptions 2018-12-13 09:51:19 +00:00
Yousong Zhou 9a8b9bf7b1 mcclient: options: routetables: fix compilation 2018-12-13 09:39:01 +00:00
zhengjiajie 1ee2e783aa zhengjj submit 4 files 2018-12-13 14:51:35 +08:00
Qiu Jian 4ede254c1d Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-region-geographicinfo 2018-12-12 22:56:19 +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
Yousong Zhou 010cafa4c5 routetables: routetable-purge支持 2018-12-12 14:20:43 +00:00
Yousong Zhou b736983fe9 routetables: routetable-list --manager <provider-id>支持 2018-12-12 14:20:43 +00:00
屈轩 9473893d77 冲突解决 2018-12-12 21:37:03 +08:00
屈轩 6590a00f2a 冲突解决 2018-12-12 21:36:17 +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
邱剑 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
邱剑 5943754e7f Automatic merge from release/2.3.0 -> release/2.4.0
* commit '5e94bdded3422e217d0ac6803ccb26b6794eebf7':
  project删除bufix
2018-12-12 15:11:29 +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
邱剑 29300936d4 Automatic merge from release/2.1.0 -> release/2.2.0
* commit 'fad903ce33e7f2da0727b6f2823db500bc06e30a':
  project删除bufix
2018-12-12 15:11:28 +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
TangBin 68249b00d7 project删除bufix 2018-12-12 15:06:09 +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
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 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
唐斌 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
zhengjiajie beec785040 add bill-detail file 2018-12-11 16:29:50 +08:00
邱剑 7feab1d5d0 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '77427a2d1ba197fc8781a21a5263dd230fb82fa3':
  bugfix
2018-12-11 10:35:18 +08:00
邱剑 fcdc89610a Automatic merge from release/2.0.0 -> release/2.1.0
* commit '12776a4d48148c6c9eba301abf47756a31ff72c0':
  bugfix
2018-12-11 10:35:18 +08:00
邱剑 77427a2d1b Automatic merge from release/2.1.0 -> release/2.2.0
* commit 'fcdc89610a9e9c2bb4e33d624fa780e3efdde8a0':
  bugfix
2018-12-11 10:35:18 +08:00
TangBin f4f117813a bugfix 2018-12-11 10:33:31 +08:00
Yousong Zhou e2fad5b299 treewide: 改正structarg AddArgument()时Duplicate argument xxx错误 2018-12-10 08:26:56 +00: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
Qiu Jian b69bc264a2 修正:1. 多余1个磁盘的recycle主机创建失败 2018-12-08 10:29:16 +08:00
Zexi Li c13c7da0a2 climc: set default manager api version 2018-12-07 22:11:24 +08:00
Qiu Jian e5f91a0e41 make fmt 2018-12-07 18:02:57 +08:00
Qiu Jian 965e84ea36 update 2018-12-07 02:57:58 +08:00