Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

3f7e028a

Commit 3f7e028a authored 10 years ago by Patrick Dowler

Downloads
- Plain Diff

Merge branch 'nep110' of /srv/cadc/git/wopencadc into nep110

parents f3204d60 fcd9bc98

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java 64 additions, 7 deletions

...l-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/AddGroupMemberAction.java 1 addition, 2 deletions

...r/src/ca/nrc/cadc/ac/server/web/AddGroupMemberAction.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/AddUserMemberAction.java 2 additions, 2 deletions

...er/src/ca/nrc/cadc/ac/server/web/AddUserMemberAction.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/GroupsAction.java 8 additions, 8 deletions

...ol-Server/src/ca/nrc/cadc/ac/server/web/GroupsAction.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/RemoveGroupMemberAction.java 1 addition, 1 deletion

...rc/ca/nrc/cadc/ac/server/web/RemoveGroupMemberAction.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/RemoveUserMemberAction.java 1 addition, 2 deletions

...src/ca/nrc/cadc/ac/server/web/RemoveUserMemberAction.java
projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java 47 additions, 5 deletions

...test/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java
projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java 16 additions, 5 deletions

...adcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java

with 140 additions and 32 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