[cloudstack] branch master updated (2661ce8 -> 5b3f351)

[da...@apache.org]

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

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


    from 2661ce8  server: add global configuration for default router service offering (#3946)
     add 15954fe  Validating type parameter and including all types (#4412)
     new 5b3f351  Merge branch '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/network/Network.java         | 16 +++++++++++++++-
 .../api/command/user/network/ListNetworksCmd.java        | 11 +++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

[cloudstack] 01/01: Merge branch '4.14'

[da...@apache.org]

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

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

commit 5b3f3512ba72d17bb57943251074e65e45a86a50
Merge: 2661ce8 15954fe
Author: Daan Hoogland <da...@onecht.net>
AuthorDate: Wed Oct 21 07:59:03 2020 +0000

    Merge branch '4.14'

 api/src/main/java/com/cloud/network/Network.java         | 16 +++++++++++++++-
 .../api/command/user/network/ListNetworksCmd.java        | 11 +++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)