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 2020/08/28 09:30:51 UTC
[cloudstack] branch master updated (3b4a8fc -> 749e302)
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 3b4a8fc api: List networks using networkofferingid (#4258)
add 8dfc11a router: Save PlaceHolder nic for VR if network does not have source nat (#3902)
add ba4b04f ui: Hide cpuspeed for custom constrained offering (#3996)
add 14c0d9e Merge remote-tracking branch 'origin/4.13' into 4.14
new 749e302 Merge remote-tracking branch 'origin/4.14'
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:
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(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.14'
Posted by ro...@apache.org.
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 <ro...@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(-)