Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

b9dd71bd

Commit b9dd71bd authored 10 years ago by Ed Chapin

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/s1689' into s1689

parents 4a0a4bdb a7369411

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

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

...ol-Server/src/ca/nrc/cadc/ac/server/RequestValidator.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java 5 additions, 6 deletions

...ol-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/ACSearchRunner.java 49 additions, 14 deletions

...-Server/src/ca/nrc/cadc/ac/server/web/ACSearchRunner.java

with 59 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