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
..
MockAccountManagerImpl.java	Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account	2014-04-29 13:37:28 +02:00
MockDomainManagerImpl.java	Reformatted all of the code.	2013-11-21 06:15:26 -08:00