[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14

[rohit]

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 9642392a0a6974e6277f696f8e50b63c36a7b7b9
Merge: 615ab4e c03f8a1
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Wed Jun 24 19:25:30 2020 +0530

    Merge remote-tracking branch 'origin/4.13' into 4.14
    
    Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>

 .../api/command/LdapListConfigurationCmd.java      |  8 ++++++
 .../apache/cloudstack/ldap/LdapManagerImpl.java    |  3 ++-
 .../cloudstack/ldap/dao/LdapConfigurationDao.java  |  4 +++
 .../ldap/dao/LdapConfigurationDaoImpl.java         | 30 +++++++++++++++++-----
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --cc 
plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java
index b591e3a,78c9bae..c053e87
--- 
a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java
+++ 
b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java
@@@ -88,4 -104,4 +104,4 @@@ public class LdapConfigurationDaoImpl e
          }
          return sc;
      }
--}
++}