Zexi Li
fdc918a0ee
Merge pull request #7005 from ioito/automated-cherry-pick-of-#6998-upstream-release-3.2
...
Automated cherry pick of #6998 : fix: manager_id资源隔离获取
2020-07-02 20:20:23 +08:00
wanyaoqi
4e22ff4805
bind mount nfs storage path
2020-07-02 14:35:13 +08:00
Qu Xuan
aaa3d498a5
fix: manager_id资源隔离获取
2020-07-02 14:30:18 +08:00
rainzm
9c141930c2
fix the bug introduced in #6643
2020-07-01 16:54:28 +08:00
Zexi Li
d27574e832
Merge pull request #6969 from ioito/automated-cherry-pick-of-#6903-upstream-release-3.2
...
Automated cherry pick of #6903 : fix: 修正项目映射同步
2020-07-01 16:30:02 +08:00
wanyaoqi
6feeff2009
fix deploy backup server order
2020-06-30 22:03:51 +08:00
Qu Xuan
60cdc3fdda
fix: 支持同步project标签到本地资源
2020-06-30 14:08:49 +08:00
Qu Xuan
6bed7639b0
fix: 修正项目映射同步
2020-06-30 11:52:41 +08:00
Qiu Jian
24f4b91955
fix: disable domain sharing if non_default_domain_projects turned off
2020-06-28 13:26:31 +08:00
Yousong Zhou
b3588b48a2
lb: include cluster name info in details
2020-06-24 18:55:51 +08:00
Zexi Li
98a0d39a0a
Merge pull request #6935 from wanyaoqi/automated-cherry-pick-of-#6933-upstream-release-3.2
...
Automated cherry pick of #6933 : server name enable upper case
2020-06-24 17:42:27 +08:00
Zexi Li
f7fde18f46
Merge pull request #6920 from ioito/automated-cherry-pick-of-#6918-upstream-release-3.2
...
Automated cherry pick of #6918 : fix: 避免azure同步项目失败
2020-06-24 12:58:40 +08:00
Zexi Li
0cb69b7fb6
Merge pull request #6928 from ioito/automated-cherry-pick-of-#6926-upstream-release-3.2
...
Automated cherry pick of #6926 : fix: google资源名称兼容处理
2020-06-23 23:29:39 +08:00
Qiu Jian
9a6362cd6b
fix: sort quota list result by usage rate
2020-06-23 22:24:00 +08:00
wanyaoqi
74037b56ca
server name enable upper case
2020-06-23 21:07:16 +08:00
Qu Xuan
a898351061
fix: google资源名称兼容处理
2020-06-23 20:30:54 +08:00
Qiu Jian
21f1486001
fix: simplify forbidden user login message
2020-06-23 17:47:49 +08:00
Qu Xuan
8ec7fd93dc
fix: 避免azure同步项目失败
2020-06-23 17:32:49 +08:00
Zexi Li
f3b2f3d93e
Merge pull request #6905 from wanyaoqi/automated-cherry-pick-of-#6904-upstream-release-3.2
...
Automated cherry pick of #6904 : fix get storage capabilities with null field
2020-06-23 11:53:31 +08:00
Qu Xuan
3452b85d69
optimized: 支持ip和端口过滤安全组
2020-06-23 11:26:37 +08:00
wanyaoqi
063ac404f0
disable dhclient
2020-06-22 21:30:53 +08:00
wanyaoqi
1425da2ccd
fix get storage capabilities with null field
2020-06-22 20:00:15 +08:00
Yousong Zhou
8bb60ea439
cloudcommon: policy: fix interval and oneshot sync
...
Reduce CPU utilization caused by queued time.AfterFunc calls
2020-06-21 18:34:00 +08:00
Yousong Zhou
f59f5cb4bf
cloudcommon: app: cosmetic change
2020-06-21 18:34:00 +08:00
yunion-ci-robot
c8e986d077
Merge pull request #6870 from rainzm/automated-cherry-pick-of-#6869-upstream-release-3.2
...
Automated cherry pick of #6869 : Notify/email fix
2020-06-19 10:09:22 +08:00
yunion-ci-robot
2878cc81e8
Merge pull request #6884 from swordqiu/automated-cherry-pick-of-#6883-upstream-release-3.2
...
Automated cherry pick of #6883 : fix: network created by sysadmin should be shared by default
2020-06-19 09:50:14 +08:00
Qiu Jian
bd2a4e2832
fix: wrong cloud provider status when sync disconnected cloud account
2020-06-19 01:21:00 +08:00
yunion-ci-robot
cacd42ee15
Merge pull request #6860 from yousong/automated-cherry-pick-of-#6859-upstream-release-3.2
...
Automated cherry pick of #6859 : cloudaccounts: one sync task in queue per cloudaccount
2020-06-18 23:20:03 +08:00
Qiu Jian
95413e8a02
fix: network created by sysadmin should be shared by default
2020-06-18 22:48:26 +08:00
wanyaoqi
639e4fb87f
fix reserved ip export keys
2020-06-18 21:45:56 +08:00
rainzm
7ffb1c969f
fix: Fix problems about sending verify email
2020-06-18 19:05:58 +08:00
rainzm
a1a96f35fe
fix: Fix the url of 'notify-template-delete' in climc
2020-06-18 19:05:58 +08:00
Zexi Li
a06b9c7884
Merge pull request #6872 from ioito/automated-cherry-pick-of-#6871-upstream-release-3.2
...
Automated cherry pick of #6871 : fix: 避免同步删除失败
2020-06-18 19:05:31 +08:00
Qu Xuan
fd788b15b3
fix: 避免同步删除失败
2020-06-18 17:20:11 +08:00
Yousong Zhou
2ccc45df92
cloudaccounts: one sync task in queue per cloudaccount
2020-06-18 17:12:09 +08:00
tangbin
8fd53d0db5
replace err with errors.cause
2020-06-18 14:30:52 +08:00
Zexi Li
5775c13fbf
Merge pull request #6862 from tb365/automated-cherry-pick-of-#6861-upstream-release-3.2
...
Automated cherry pick of #6861 : shuzhou to suzhou
2020-06-17 18:50:50 +08:00
Zexi Li
c9998c8b47
Merge pull request #6841 from zexi/automated-cherry-pick-of-#6839-upstream-release-3.2
...
Automated cherry pick of #6839 : scheduler: fix memory over committed
2020-06-17 18:49:35 +08:00
tangbin
43000c7d77
shuzhou to suzhou
2020-06-17 15:53:42 +08:00
Yousong Zhou
7f98ec2a30
appsrv: rework TestRing
2020-06-17 10:53:15 +08:00
Yousong Zhou
4e735f8972
appsrv: ring: release ring content on pop
2020-06-17 10:53:15 +08:00
Qiu Jian
406cc01b7c
fix: policy allow if one of the matching rules is allow
2020-06-16 23:11:01 +08:00
Qiu Jian
d8d8256b0a
fix: disable policy rule compaction
2020-06-16 23:11:01 +08:00
wanyaoqi
479b309160
fix cpu usage metrics
2020-06-16 20:44:00 +08:00
Zexi Li
d3ecbd98f8
Merge pull request #6825 from wanyaoqi/automated-cherry-pick-of-#6824-upstream-release-3.2
...
Automated cherry pick of #6824 : fix windows install regedit record
2020-06-16 20:13:02 +08:00
Zexi Li
a957815041
scheduler: fix memory over committed
2020-06-16 19:12:47 +08:00
Zexi Li
bf2d727933
Merge pull request #6829 from yousong/bugfix/yousong-lblistener-cert-32
...
[3.2] Bugfix/yousong lblistener cert 32
2020-06-15 17:37:11 +08:00
Qu Xuan
ada6d9e00c
fix: 优化标签列表version问题
2020-06-15 14:06:18 +08:00
Yousong Zhou
6a10d8a66a
lblistener: rename filter name certificate{,_id}
...
Previously we accept both, now with structured input we'd better choose
one and ignore the other. Use certificate_id because that's the
console's choice
2020-06-15 11:26:07 +08:00
Yousong Zhou
9fd612c5ac
lblisteners: list: filter with certificate ids
2020-06-15 11:25:53 +08:00
Zexi Li