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	Contrail Event Interceptor fix	2014-02-10 22:43:38 -07:00
src/org/apache/cloudstack/network/contrail	CLOUDSTACK-6322 - Don't allow service instance creation with empty or null service-instance "name".	2014-04-17 03:47:43 -06:00
test	Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account	2014-04-29 14:38:32 +05:30
pom.xml	internal lb support for contrail vpc	2014-04-04 15:35:58 -07:00