[cloudstack] branch 4.14 updated (ba76778 -> 3bd1dde)

[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 ba76778  Merge remote-tracking branch 'origin/4.13' into 4.14
     add affd010  templates: Fixed incorrect error message on invalid template type download (#4138)
     new 3bd1dde  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:
 .../storage/template/HttpTemplateDownloader.java      | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 core/src/main/java/com/cloud/storage/template/HttpTemplateDownloader.java

[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 3bd1ddec88415075c157b41d2a0962d1c2657bbd
Merge: ba76778 affd010
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Wed Jul 15 16:14:58 2020 +0530

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

 .../storage/template/HttpTemplateDownloader.java      | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)