This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch 4.12
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from bea627a Merge branch '4.11' into 4.12
add 41f569e router: Fix rule duplication with non-VPC static NAT rules
(#3366)
add 8fb388e router: support multi-homed VMs in VPC (#3373)
new ff23131 Merge remote-tracking branch 'origin/4.11' into 4.12
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:
.../main/java/com/cloud/network/element/VirtualRouterElement.java | 1 +
systemvm/debian/opt/cloud/bin/configure.py | 8 ++++----
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 8 +++-----
systemvm/debian/opt/cloud/bin/cs_dhcp.py | 5 -----
4 files changed, 8 insertions(+), 14 deletions(-)
