[cloudstack] branch 4.14 updated (db9f825 -> ba76778)

[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 db9f825  server: don't export B&R APIs if feature is not enabled globally (#4202)
     add 139aa13  server: Purge all cookies on logout, set /client path on login (#4176)
     new ba76778  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:
 .../src/main/java/org/apache/cloudstack/saml/SAMLUtils.java |  2 +-
 server/src/main/java/com/cloud/api/ApiServlet.java          | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

[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 ba767783bd733832524fabdc7a683c300e309b49
Merge: db9f825 139aa13
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Wed Jul 8 11:36:30 2020 +0530

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

 .../src/main/java/org/apache/cloudstack/saml/SAMLUtils.java |  2 +-
 server/src/main/java/com/cloud/api/ApiServlet.java          | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)