etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/api/src/com/cloud/user
History
Rajani Karuturi 69e550f5ea 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 13:37:28 +02:00
..
Account.java Merge branch 'master' into rbac. 2014-01-17 14:37:08 -08:00
AccountService.java Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account 2014-04-29 13:37:28 +02:00
DomainService.java Removed trailing spaces 2013-11-21 04:08:01 -08:00
OwnedBy.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
ResourceLimitService.java Merge branch 'master' into rbac. 2014-01-17 14:37:08 -08:00
SSHKeyPair.java api: Refactor move acl to org.apache.cloudstack 2013-01-06 15:30:58 -08:00
User.java Reformatted all of the code. 2013-11-21 06:15:26 -08:00
UserAccount.java Reformatted all of the code. 2013-11-21 06:15:26 -08:00