You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cloudstack.apache.org by da...@apache.org on 2018/07/20 11:37:16 UTC

[cloudstack] 01/01: Merge release branch 4.11 to master

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 c3ff356c15820ff9a6c5fd105e748d02b28b69fd
Merge: 1ccb32f 781d6bc
Author: Daan Hoogland <da...@onecht.net>
AuthorDate: Fri Jul 20 11:31:53 2018 +0000

    Merge release branch 4.11 to master
    
    * 4.11:
      register template kvm context ui fix (#2757)
      check volumes for state when retrieving pool for configDrive creation (#2709)

 .../network/element/ConfigDriveNetworkElement.java | 79 ++++++++++++++++++----
 ui/scripts/templates.js                            |  2 +-
 2 files changed, 67 insertions(+), 14 deletions(-)