Rajani Karuturi 69e550f5ea Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account ... Conflicts: api/src/com/cloud/user/AccountService.java plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java Signed-off-by: Koushik Das <koushik@apache.org>		2014-04-29 13:37:28 +02:00
..
conf	Summary: Updated sudoers approved commands for cloud user	2013-10-23 13:42:16 -07:00
resources	Adding SecurityChecker list for the ParamProcessWorker	2014-04-01 12:06:16 -07:00
scripts	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
src	Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account	2014-04-29 13:37:28 +02:00
test	Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account	2014-04-29 13:37:28 +02:00
pom.xml	Removed all reminants of the IdentityService. Created the KeysManager to move the management	2014-01-14 13:11:35 -08:00