Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

f64bbc4f

Commit f64bbc4f authored 10 years ago by Adrian Damian

Downloads
- Plain Diff

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

parents d64d22ff dd38d8db

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

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

projects/cadcAccessControl-Server/build.xml
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java 12 additions, 8 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 34 additions, 4 deletions

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

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

with 60 additions and 26 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