This is an automated email from the ASF dual-hosted git repository. dahn pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit fb1e903532d943bc98a1a8b95d4499013234a917 Merge: 5bea0a1 83ae6d7 Author: Daan Hoogland <[email protected]> AuthorDate: Thu Dec 3 15:11:59 2020 +0100 Merge branch '4.14' api/src/main/java/com/cloud/vm/NicProfile.java | 4 ++ .../cloud/network/router/NicProfileHelperImpl.java | 3 +- .../VpcVirtualNetworkApplianceManagerImpl.java | 72 ++++++++++++---------- .../test_multiple_subnets_in_isolated_network.py | 5 +- ...est_multiple_subnets_in_isolated_network_rvr.py | 5 +- .../component/test_multiple_subnets_in_vpc.py | 35 ++++++----- .../component/test_multiple_subnets_in_vpc_rvr.py | 35 ++++++----- tools/marvin/marvin/lib/common.py | 5 ++ 8 files changed, 94 insertions(+), 70 deletions(-)
