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
..
com/cloud	Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account	2014-04-29 14:38:32 +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:16:13 -07:00
resources	CLOUDSTACK-6151: Local data disk with tag goes to the wrong local storage pool	2014-04-16 16:20:04 +05:30
async-job-component.xml	All Checkstyle problems corrected	2013-12-12 12:26:07 -08:00
sync-queue-component.xml	License header updates for the server folder.	2012-08-03 09:41:27 -04:00