Rajani Karuturi 08ec6ebdda 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 14:38:32 +05:30
..
resources/META-INF/cloudstack	Removed "host" config parameter definition from ClusterManager interface as it got moved to cloud-api package	2014-01-21 17:19:52 -08:00
src	Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account	2014-04-29 14:38:32 +05:30
test	Merge branch 'master' into rbac.	2014-03-13 11:05:03 -07:00
pom.xml	Bump 4.3.0 to 4.4.0 in master	2013-11-21 16:01:15 +01:00