You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2019/06/03 11:48:46 UTC
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.12'
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 1c5244a0c58510c467707d5d9f2c4fbc72d784d0
Merge: 6946f41 b2b99ca
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Mon Jun 3 17:17:51 2019 +0530
Merge remote-tracking branch 'origin/4.12'
.../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(-)