邱剑
1c14ea16fd
Merge pull request #526 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-resolve-conflict-azure-network-2.3.0 to release/2.3.0
...
* commit '5568a009d18656804c8249b1b21b617fdb7e119c':
解决冲突
2018-11-16 21:47:22 +08:00
屈轩
54dda9496f
重复使用已分配的未使用网卡
2018-11-16 21:40:57 +08:00
屈轩
5568a009d1
解决冲突
2018-11-16 21:37:02 +08:00
周有松
35e65898b4
Merge pull request #523 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lblis-clear-acl_id to release/2.3.0
...
* commit '76c60926c6ee6f77fe9303ee1c6fb38b1319783f':
loadbalancerlisteners: clear out acl_id when acl_status=off
2018-11-16 21:09:35 +08:00
周有松
06adb33c75
Automatic merge from release/2.3.0 -> release/2.4.0
...
* commit '35e65898b4f9600edc09fc1cadb698e106912e23':
loadbalancerlisteners: clear out acl_id when acl_status=off
2018-11-16 21:09:35 +08:00
邱剑
13da8d331b
Automatic merge from release/2.3.0 -> release/2.4.0
...
* commit '641a637e37d8fefdfaabd27b628397807f38b2ff':
usage: fix schedtag usage panic
2018-11-16 20:36:00 +08:00
Yousong Zhou
76c60926c6
loadbalancerlisteners: clear out acl_id when acl_status=off
2018-11-16 12:18:28 +00:00
Zexi Li
f65e031597
usage: fix schedtag usage panic
2018-11-16 18:43:50 +08:00
屈轩
503bec34c8
去除不需要接口
2018-11-16 17:59:45 +08:00
邱剑
a291be31d4
Automatic merge from release/2.2.0 -> release/2.3.0
...
* commit '2453fadf997916972d5e118aef5c0bd9b36e9471':
去除主机名中文字符
2018-11-16 17:24:04 +08:00
邱剑
835de026fc
Automatic merge from release/2.3.0 -> release/2.4.0
...
* commit 'a291be31d4b41d691683bbf6e01c1114a4d036e2':
去除主机名中文字符
2018-11-16 17:24:04 +08:00
屈轩
110fdc1d24
去除主机名中文字符
2018-11-16 17:23:03 +08:00
邱剑
917345a4f7
Automatic merge from release/2.2.0 -> release/2.3.0
...
* commit '4890c6aea26a731596f11a6368ea7436dac17231':
Azure主机名称带上region信息,避免名称重复
2018-11-16 17:20:46 +08:00
邱剑
19d4bdfb71
Automatic merge from release/2.3.0 -> release/2.4.0
...
* commit '917345a4f77b7d374379d81fd6c8aead071f00a6':
Azure主机名称带上region信息,避免名称重复
2018-11-16 17:20:46 +08:00
屈轩
de45f88830
Azure主机名称带上region信息,避免名称重复
2018-11-16 17:16:58 +08:00
邱剑
e5d0321695
Merge pull request #517 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-networks-port-used to release/2.3.0
...
* commit '6d27d05ae78de72e58e5d29e76f99330dd68bcac':
networks: add "port_used" field to details listing
2018-11-16 16:52:03 +08:00
邱剑
cc752b2c34
Automatic merge from release/2.3.0 -> release/2.4.0
...
* commit 'e5d032169564456b182648fdf39e969bee65bdb8':
networks: add "port_used" field to details listing
2018-11-16 16:52:03 +08:00
屈轩
2e868ed7c1
避免公有云找不到对应的cloudregion
2018-11-16 16:09:02 +08:00
屈轩
a07ab4c121
初始化model
2018-11-16 15:05:05 +08:00
邱剑
dcbe81a7ab
Merge pull request #516 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-cloudaccount-validate to release/2.3.0
...
* commit '4c4b93aa4b67470dabb2fccdc2400f64cc315de9':
避免公有云账号认证失败后返回系统登录界面
2018-11-16 14:55:04 +08:00
邱剑
011ff7d548
Automatic merge from release/2.3.0 -> release/2.4.0
...
* commit 'dcbe81a7ab58e9aed2a127a8a2e6fd052481081d':
避免公有云账号认证失败后返回系统登录界面
2018-11-16 14:55:04 +08:00
屈轩
4c4b93aa4b
避免公有云账号认证失败后返回系统登录界面
2018-11-16 14:53:06 +08:00
邱剑
0e4bdc92f2
Merge pull request #515 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-rbac-20181115 to release/2.3.0
...
* commit '4034ee517e55bda87a71d81d59d3b770474e3792':
make fmt
skip cloutpost
make rbac default enabled
增加user/guest两个权利等级
minor fixes
2018-11-16 14:41:55 +08:00
邱剑
118e339e13
Automatic merge from release/2.3.0 -> release/2.4.0
...
* commit '0e4bdc92f2a814bede3ebb72b907d52b90768c1a':
make fmt
skip cloutpost
make rbac default enabled
增加user/guest两个权利等级
minor fixes
2018-11-16 14:41:55 +08:00
Yousong Zhou
6d27d05ae7
networks: add "port_used" field to details listing
2018-11-16 04:15:49 +00:00
Qiu Jian
4034ee517e
make fmt
2018-11-16 01:43:01 +08:00
Qiu Jian
ca73b5442e
skip cloutpost
2018-11-16 01:35:33 +08:00
Qiu Jian
c434cd5669
make rbac default enabled
2018-11-16 01:33:18 +08:00
Qiu Jian
2734d2f5db
增加user/guest两个权利等级
2018-11-16 01:32:01 +08:00
Qiu Jian
ca0e3977c7
minor fixes
2018-11-15 23:41:04 +08:00
邱剑
a5ce78ea86
Automatic merge from release/2.3.0 -> release/2.4.0
...
* commit '7c1b77a5fc3efa1fb8afcfad5cb0d1f2582460d1':
使用调度标签限制调度创建经典实例
2018-11-15 21:15:21 +08:00
邱剑
7c1b77a5fc
Automatic merge from release/2.2.0 -> release/2.3.0
...
* commit '0befda17797db0ee1bceb624cdf4bbd79069f8d6':
使用调度标签限制调度创建经典实例
2018-11-15 21:15:20 +08:00
屈轩
4035cbe363
使用调度标签限制调度创建经典实例
2018-11-15 21:13:16 +08:00
邱剑
0183ffbb6d
Automatic merge from release/2.3.0 -> release/2.4.0
...
* commit 'b3221c24bf56a3f31bb5f6abb5c6383fd668a33a':
替换使用xterm-256color
2018-11-15 20:15:31 +08:00
邱剑
b3221c24bf
Merge pull request #513 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-webssh-xterm to release/2.3.0
...
* commit '174d13274388df3697d5aa7a0bab03e491249b97':
替换使用xterm-256color
2018-11-15 20:15:30 +08:00
邱剑
f049e39d8c
Automatic merge from release/2.3.0 -> release/2.4.0
...
* commit '5f9bd7faf8b37d99222b7198d5ac9b0e0581789c':
替换使用xterm-256color
2018-11-15 20:15:18 +08:00
邱剑
5f9bd7faf8
Automatic merge from release/2.2.0 -> release/2.3.0
...
* commit '609d0a997590c192151d85346c6a1a849c571cd9':
替换使用xterm-256color
2018-11-15 20:15:17 +08:00
屈轩
174d132743
替换使用xterm-256color
2018-11-15 20:12:44 +08:00
屈轩
7c15b8d2fb
替换使用xterm-256color
2018-11-15 20:10:59 +08:00
TangBin
9bf73e99d9
return err
2018-11-15 19:26:35 +08:00
邱剑
1ab14c8007
Automatic merge from release/2.3.0 -> release/2.4.0
...
* commit '475db4c6354b0ca312678a076987ecf813744d56':
补充Azure创建快照功能
2018-11-15 18:18:23 +08:00
屈轩
580202e8be
解决冲突
2018-11-15 18:16:53 +08:00
TangBin
010f5c1f97
vpc fix
2018-11-15 18:00:40 +08:00
周有松
84ca002814
Automatic merge from release/2.3.0 -> release/2.4.0
...
* commit 'ea3aa1bef5426dee9738d3d2708305d3b2ac0ac5':
climc: dnsrecords: allow create and list with is_public
cloudcommon: sharablevirtual: set is_public as create:admin_optional
2018-11-15 15:33:12 +08:00
周有松
ea3aa1bef5
Merge pull request #509 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-dnsrecords-is_public to release/2.3.0
...
* commit '5753f119b9312563d67f655cf19b78dfa3866536':
climc: dnsrecords: allow create and list with is_public
cloudcommon: sharablevirtual: set is_public as create:admin_optional
2018-11-15 15:33:12 +08:00
李泽玺
7e392f87d0
Automatic merge from release/2.3.0 -> release/2.4.0
...
* commit '699bb9d8d5f670b74866ee1f9f53972d2dcd17e6':
fix request host error
2018-11-15 15:26:03 +08:00
Yousong Zhou
5753f119b9
climc: dnsrecords: allow create and list with is_public
2018-11-15 07:18:50 +00:00
Yousong Zhou
ab7a3f744e
cloudcommon: sharablevirtual: set is_public as create:admin_optional
2018-11-15 07:18:50 +00:00
wanyaoqi
2e19f3032d
fix request host error
2018-11-15 13:50:08 +08:00
屈轩
ce70ab3300
补充Azure创建快照功能
2018-11-15 12:01:22 +08:00
邱剑