----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/20703/#review41703 -----------------------------------------------------------
Commit 69e550f5ea0ea1b85adcce6366d97cffa0276e73 in cloudstack's branch refs/heads/4.4 from Rajani Karuturi [ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=69e550f ] 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 <kous...@apache.org> - ASF Subversion and Git Services On April 29, 2014, 8:52 a.m., Rajani Karuturi wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/20703/ > ----------------------------------------------------------- > > (Updated April 29, 2014, 8:52 a.m.) > > > Review request for cloudstack, Abhinandan Prateek, Ian Duffy, and Koushik Das. > > > Bugs: CLOUDSTACK-6509 > https://issues.apache.org/jira/browse/CLOUDSTACK-6509 > > > Repository: cloudstack-git > > > Description > ------- > > importing multiple ldap users to the same cloudstack account fails with > message account already exists. > > > Diffs > ----- > > api/src/com/cloud/user/AccountService.java 71136bf > > plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java > cad5a50 > > plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java > 626bb8f > > plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java > 887ad00 > > plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapImportUsersCmdSpec.groovy > a66da1f > server/src/com/cloud/user/AccountManagerImpl.java 7bd46f0 > server/test/com/cloud/user/MockAccountManagerImpl.java 2f57abc > ui/scripts/accountsWizard.js 6b4907c > > Diff: https://reviews.apache.org/r/20703/diff/ > > > Testing > ------- > > manually tested. added unittests whereever possible. > > > Thanks, > > Rajani Karuturi > >
