This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 6946f41 Fix template size for managed storage / refactor cloud-install-sys-tmplt and createtmplt.sh (#3346) add 2484527 srx: Fix removing static NAT rules with Juniper SRX (#3310) add c9ce3e2 router: Persistent DHCP leases file on VRs and cleanup /etc/hosts on VM deletion (#3351) add b2b99ca Merge remote-tracking branch 'origin/4.11' into 4.12 new 1c5244a Merge remote-tracking branch 'origin/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: .../cloud/network/element/DhcpServiceProvider.java | 2 ++ .../cloud/agent/api/routing/DhcpEntryCommand.java | 9 ++++++ .../virtualnetwork/facade/DhcpEntryConfigItem.java | 2 +- .../virtualnetwork/model/VmDhcpConfig.java | 14 ++++++++- .../service/NetworkOrchestrationService.java | 4 +++ .../engine/orchestration/NetworkOrchestrator.java | 28 +++++++++++++++++ .../networkservice/BaremetalDhcpElement.java | 5 ++++ .../contrail/management/ContrailElementImpl.java | 5 ++++ .../cloud/network/resource/JuniperSrxResource.java | 9 +++--- .../network/element/VirtualRouterElement.java | 28 +++++++++++++++++ .../cloud/network/router/CommandSetupHelper.java | 5 ++-- .../com/cloud/network/rules/DhcpEntryRules.java | 10 +++++++ .../main/java/com/cloud/vm/UserVmManagerImpl.java | 14 ++++++--- .../network/topology/AdvancedNetworkTopology.java | 15 ++++++++++ .../network/topology/AdvancedNetworkVisitor.java | 3 +- .../network/topology/BasicNetworkTopology.java | 21 +++++++++++++ .../network/topology/BasicNetworkVisitor.java | 3 +- .../network/topology/NetworkTopology.java | 2 ++ .../java/com/cloud/vpc/MockNetworkManagerImpl.java | 4 +++ systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 35 ++++++++++++++++++---- systemvm/debian/opt/cloud/bin/cs_dhcp.py | 4 +++ 21 files changed, 203 insertions(+), 19 deletions(-)