4abbfd9932
Merge pull request #6877 from tb365/automated-cherry-pick-of-#6875-upstream-release-3.2
...
Automated cherry pick of #6875 : replace err with errors.cause
2020-06-18 15:13:06 +08:00
8fd53d0db5
replace err with errors.cause
2020-06-18 14:30:52 +08:00
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
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
43000c7d77
shuzhou to suzhou
2020-06-17 15:53:42 +08:00
bce22f04d4
Merge pull request #6855 from yousong/automated-cherry-pick-of-#6837-upstream-release-3.2
...
Automated cherry pick of #6837 : appsrv: ring: release ring content on pop
2020-06-17 11:24:35 +08:00
7f98ec2a30
appsrv: rework TestRing
2020-06-17 10:53:15 +08:00
4e735f8972
appsrv: ring: release ring content on pop
2020-06-17 10:53:15 +08:00
21650e61f9
Merge pull request #6850 from swordqiu/automated-cherry-pick-of-#6849-upstream-release-3.2
...
Automated cherry pick of #6849 : fix: disable policy rule compaction
2020-06-17 10:29:01 +08:00
406cc01b7c
fix: policy allow if one of the matching rules is allow
2020-06-16 23:11:01 +08:00
d8d8256b0a
fix: disable policy rule compaction
2020-06-16 23:11:01 +08:00
75576e17dc
Merge pull request #6845 from wanyaoqi/automated-cherry-pick-of-#6844-upstream-release-3.2
...
Automated cherry pick of #6844 : fix cpu usage metrics
2020-06-16 21:00:44 +08:00
479b309160
fix cpu usage metrics
2020-06-16 20:44:00 +08:00
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
a957815041
scheduler: fix memory over committed
2020-06-16 19:12:47 +08:00
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
231a3a9fdd
Merge pull request #6831 from ioito/automated-cherry-pick-of-#6830-upstream-release-3.2
...
Automated cherry pick of #6830 : fix: 优化标签列表version问题
2020-06-15 14:11:16 +08:00
ada6d9e00c
fix: 优化标签列表version问题
2020-06-15 14:06:18 +08:00
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
9fd612c5ac
lblisteners: list: filter with certificate ids
2020-06-15 11:25:53 +08:00
18cb393ba3
fix windows install regedit record
2020-06-15 10:58:07 +08:00
4e6bb13c52
Merge pull request #6818 from yousong/automated-cherry-pick-of-#6817-upstream-release-3.2
...
Automated cherry pick of #6817 : guestnetworks: use math/rand instead of crypto/rand
2020-06-12 10:10:01 +08:00
2989ecfe8a
guestnetworks: reduce odds of collision seeded by epoch seconds
2020-06-11 21:22:16 +08:00
a91e8230f3
guestnetworks: use math/rand instead of crypto/rand
2020-06-11 21:22:16 +08:00
e8592d9158
Merge pull request #6809 from ioito/automated-cherry-pick-of-#6808-upstream-release-3.2
...
Automated cherry pick of #6808 : fix: 避免sql erorr
2020-06-11 17:52:40 +08:00
a765271c55
Merge pull request #6812 from ioito/automated-cherry-pick-of-#6810-upstream-release-3.2
...
Automated cherry pick of #6810 : fix: 避免openstack磁盘和存储窜位
2020-06-11 17:52:14 +08:00
6181ce84b3
Merge pull request #6804 from zexi/automated-cherry-pick-of-#6803-upstream-release-3.2
...
Automated cherry pick of #6803 : webconsole: fix version and others handler not handle
2020-06-11 17:50:03 +08:00
51c4a420ae
fix: 避免openstack磁盘和存储窜位
2020-06-11 14:13:25 +08:00
735461541e
fix: 避免sql erorr
2020-06-11 10:42:37 +08:00
804d987dc0
Merge pull request #6798 from wanyaoqi/automated-cherry-pick-of-#6797-upstream-release-3.2
...
Automated cherry pick of #6797 : fix host list servers filter
2020-06-10 17:05:37 +08:00
f44f6532dd
webconsole: fix version and others handler not handle
2020-06-10 17:00:16 +08:00
a4968259e7
fix host list servers filter
2020-06-10 14:07:46 +08:00
97b6bcd9f0
Merge pull request #6787 from rainzm/automated-cherry-pick-of-#6786-upstream-release-3.2
...
Automated cherry pick of #6786 : fix: Hanle the error of vdisk.GetIStorage in syncCloudDisk
2020-06-10 11:28:01 +08:00
48326f46dc
Merge pull request #6731 from ioito/automated-cherry-pick-of-#6663-upstream-release-3.2
...
Automated cherry pick of #6663 : fix: 优化安全组同步逻辑
2020-06-10 11:19:30 +08:00
1fb12fe81f
Merge pull request #6780 from ioito/automated-cherry-pick-of-#6779-upstream-release-3.2
...
Automated cherry pick of #6779 : fix: 更正华为云操作成功判断
2020-06-10 10:46:02 +08:00
8c6db4e81a
Merge pull request #6776 from yousong/automated-cherry-pick-of-#6775-upstream-release-3.2
...
Automated cherry pick of #6775 : networks: sep check of masklen only for start,end type creation
2020-06-10 10:20:34 +08:00
18edd50fe3
Merge pull request #6783 from rainzm/automated-cherry-pick-of-#6782-upstream-release-3.2
...
Automated cherry pick of #6782 : fix: Add '/version' handler for notify
2020-06-10 10:19:19 +08:00
50338788c8
Merge pull request #6792 from swordqiu/automated-cherry-pick-of-#6791-upstream-release-3.2
...
Automated cherry pick of #6791 : fix: policy-explain not working properly
2020-06-10 09:52:57 +08:00
447616f779
fix: policy-explain not working properly
2020-06-09 22:28:40 +08:00
3e0344dc0d
fix: Hanle the error of vdisk.GetIStorage in syncCloudDisk
2020-06-09 19:50:00 +08:00
df44eb8082
fix: Add '/version' handler for notify
2020-06-09 18:55:06 +08:00
9443fe7b42
fix: 更正华为云操作成功判断
2020-06-09 18:21:03 +08:00
d196db034f
networks: validate that start, end, gateway ip are in the same subnet
2020-06-09 16:14:01 +08:00
90e3bcd5d0
networks: validateUpdateData: eliminate intermediate vars
2020-06-09 16:14:01 +08:00
7f052c0a79
networks: decrease indent
2020-06-09 16:14:01 +08:00
3022a121ef
networks: sep check of masklen only for start,end type creation
2020-06-09 16:14:01 +08:00
a3cda0ca59
Merge pull request #6768 from yousong/bugfix/yousong-climc-lb-create-cluster
...
mcclient: options: lb: arg rename cluster{,_id}
2020-06-09 00:12:40 +08:00
3d8ef5d442
Merge pull request #6773 from swordqiu/automated-cherry-pick-of-#6772-upstream-release-3.2
...
Automated cherry pick of #6772 : fix: disable updating zone_id for host, storage, wire
2020-06-09 00:12:05 +08:00
ce64a499bb
fix: disable updating zone_id for host, storage, wire
2020-06-08 22:02:57 +08:00
191f0dcb88
Merge pull request #6770 from zexi/automated-cherry-pick-of-#6769-upstream-release-3.2
...
Automated cherry pick of #6769 : region: retry set influxdb policy until completed
2020-06-08 21:12:07 +08:00
yunion-ci-robot