This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 5bea0a1 Merge remote-tracking branch 'origin/4.14'
add 627070c vpc vr: fix Conflicting device id on private gw nic
add 03e65a1 vpc vr: plugin nics by this order: public/private/guest
add 83ae6d7 integration test: skip vlan of public ip range in
get_free_vlan
new fb1e903 Merge branch '4.14'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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(-)
