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 3783fd5ceccdcc4d3a357397d5af4d04682c8007
Merge: def65ec 43257f8
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Mon Apr 5 13:00:18 2021 +0530
Merge remote-tracking branch 'origin/4.15'
.../router/VirtualNetworkApplianceManagerImpl.java | 10 ++++--
systemvm/debian/etc/vpcdnsmasq.conf | 1 +
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 3 ++
ui/.env.local | 1 -
ui/src/config/section/network.js | 2 +-
ui/src/views/compute/InstanceTab.vue | 36 ++++++++++++++++++++--
ui/src/views/network/IpAddressesTab.vue | 14 ++++++---
7 files changed, 57 insertions(+), 10 deletions(-)
