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 3ff122d824cd18ee1c88510073c647645bb081d5
Merge: 1d132d0 4afdee9
Author: Daan Hoogland <d...@onecht.net>
AuthorDate: Tue Jun 12 07:41:09 2018 +0000
Merge release branch 4.11 to master
* 4.11:
comment on unencryption
ui: fix create VPC dialog box failure when zone is SG enabled (#2704)
CLOUDSTACK-10381: Fix password reset / reset ssh key with ConfigDrive
isisnot=
extra message
debug message
imports
update without decrypt doesn't work
set unsensitive attributes as not 'Secure'
remove old config artifacts from update path
.../com/cloud/upgrade/dao/Upgrade41100to41110.java | 80 ++++++++++++++++++++--
.../com/cloud/upgrade/dao/Upgrade421to430.java | 74 --------------------
.../apache/cloudstack/ldap/LdapConfiguration.java | 6 +-
.../network/element/ConfigDriveNetworkElement.java | 33 ++++++++-
ui/scripts/network.js | 11 +--
5 files changed, 116 insertions(+), 88 deletions(-)
--
To stop receiving notification emails like this one, please contact
d...@apache.org.
