| 
							
							
								 Rajani Karuturi | f4779b4d0c | 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:49:06 +05:30 |  | 
			
				
					| 
							
							
								 Jessica Wang | 89945cd705 | CLOUDSTACK-5527: UI > accounts page > support both "Add (non-LDAP) Account" and "Add LDAP Account" when LDAP is enabled. | 2014-01-02 16:48:13 -08:00 |  | 
			
				
					| 
							
							
								 Rajani Karuturi | 917ea33ba9 | added LDAP group name label in add account wizard changed the parameter for domain in api importLdapUser from name to UUID
improved error handling | 2013-11-20 13:57:41 +01:00 |  | 
			
				
					| 
							
							
								 Ian Duffy | ec064b3077 | New LDAP UI Signed-off-by: Sebastien Goasguen <runseb@gmail.com> | 2013-07-29 05:58:00 -04:00 |  | 
			
				
					| 
							
							
								 Ian Duffy | eaa4143371 | Merge LDAPPlugin Signed-off-by: Abhinandan Prateek <aprateek@apache.org> | 2013-07-25 17:54:52 +05:30 |  |