[cloudstack] branch 4.14 updated (8dfc11a -> 14c0d9e)

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a change to branch 4.14
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


    from 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)
     new 14c0d9e  Merge remote-tracking branch 'origin/4.13' into 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:
 ui/scripts/instances.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.14
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 14c0d9eaa7a37ad2f0d9a81d55311680e430b689
Merge: 8dfc11a ba4b04f
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Fri Aug 28 14:59:15 2020 +0530

    Merge remote-tracking branch 'origin/4.13' into 4.14

 ui/scripts/instances.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)