This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 5471802 Merge remote-tracking branch 'origin/4.14' add c03f8a1 server: Adding listall to listLdapConfigurations (#4164) add 9642392 Merge remote-tracking branch 'origin/4.13' into 4.14 add cbbb401 Merge remote-tracking branch 'origin/4.14' No new revisions were added by this update. Summary of changes: .../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(-)