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 749e302e0ebff084bae91f855a11c6558b32b213
Merge: 3b4a8fc 14c0d9e
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Fri Aug 28 15:00:18 2020 +0530
Merge remote-tracking branch 'origin/4.14'
api/src/main/java/com/cloud/vm/NicProfile.java | 3 ++-
.../java/com/cloud/network/NetworkServiceImpl.java | 3 +++
.../network/guru/ExternalGuestNetworkGuru.java | 15 ++++++++++++
.../com/cloud/network/guru/GuestNetworkGuru.java | 27 +++++++++++++++-------
.../cloud/network/router/NetworkHelperImpl.java | 5 +++-
ui/scripts/instances.js | 6 ++++-
6 files changed, 48 insertions(+), 11 deletions(-)
