Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

4292bc53

Commit 4292bc53 authored 10 years ago by Jeff Burke

Downloads
- Plain Diff

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

parents 889da1c4 6275f438

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/RequestValidator.java 8 additions, 6 deletions

...ol-Server/src/ca/nrc/cadc/ac/server/RequestValidator.java
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 19 additions, 15 deletions

...l-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/ACSearchRunner.java 85 additions, 88 deletions

...-Server/src/ca/nrc/cadc/ac/server/web/ACSearchRunner.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 15 additions, 4 deletions

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

with 154 additions and 119 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