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
..
com/cloud	Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account	2014-04-29 14:49:06 +05:30
org/apache/cloudstack	CLOUDSTACK-6530: Populate the first class entities in the context to be available for publishing more information for the event bus, checking the displayable property etc.	2014-04-28 18:21:48 -07:00