Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

ac
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

fa0f6c76

Commit fa0f6c76 authored 9 years ago by Brian Major

Downloads
- Plain Diff

Merge branch 's1890' into s1885

parents 92fe98a0 110a1a5b

No related branches found

No related tags found

No related merge requests found

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java 3 additions, 3 deletions

...ol-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/CreateGroupAction.java 1 addition, 1 deletion

...c/ca/nrc/cadc/ac/server/web/groups/CreateGroupAction.java
cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberAction.java 7 additions, 1 deletion

...nrc/cadc/ac/server/web/groups/RemoveUserMemberAction.java
cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberActionTest.java 17 additions, 6 deletions

...cadc/ac/server/web/groups/RemoveUserMemberActionTest.java
cadcAccessControl/src/ca/nrc/cadc/ac/User.java 13 additions, 0 deletions

cadcAccessControl/src/ca/nrc/cadc/ac/User.java
cadcAccessControl/src/ca/nrc/cadc/ac/client/UserClient.java 6 additions, 4 deletions

cadcAccessControl/src/ca/nrc/cadc/ac/client/UserClient.java
cadcAccessControl/test/src/ca/nrc/cadc/ac/client/UserClientTest.java 18 additions, 2 deletions

...ontrol/test/src/ca/nrc/cadc/ac/client/UserClientTest.java

with 65 additions and 17 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment