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 cf3c2d1aab11ca28c8fbe712699cd3e65aaae32d
Merge: 8637a50 b69c378
Author: Daan Hoogland <daan.hoogl...@shapeblue.com>
AuthorDate: Fri Apr 13 11:44:30 2018 +0200

    Merge branch '4.11'

 PULL_REQUEST_TEMPLATE.md                                     | 7 +++++++
 api/src/main/java/com/cloud/agent/api/storage/OVFHelper.java | 2 +-
 python/lib/cloud_utils.py                                    | 2 +-
 python/lib/cloudutils/serviceConfig.py                       | 7 +++++--
 systemvm/debian/etc/apache2/conf-enabled/security.conf       | 3 +++
 systemvm/debian/opt/cloud/bin/setup/common.sh                | 3 ---
 ui/css/cloudstack3.css                                       | 6 +++---
 7 files changed, 20 insertions(+), 10 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
d...@apache.org.

Reply via email to