Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

6275f438

Commit 6275f438 authored 10 years ago by Brian Major

Downloads
- Plain Diff

Merge branch 's1651' of /usr/cadc/dev/git/wopencadc into s1651

parents 8ae2d384 475f2a20

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

projects/cadcAccessControl-Server/build.xml 3 additions, 3 deletions

projects/cadcAccessControl-Server/build.xml
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapDAO.java 1 addition, 1 deletion

...ontrol-Server/src/ca/nrc/cadc/ac/server/ldap/LdapDAO.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java 18 additions, 14 deletions

...l-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java 26 additions, 5 deletions

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

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

with 61 additions and 25 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