Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

9fcb2c8e

Commit 9fcb2c8e authored 9 years ago by Alinga Yeung

Downloads
- Plain Diff

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

parents 0c2b3533 1c53e20e

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/ldap/LdapUserDAO.java 17 additions, 21 deletions

...ol-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java 15 additions, 16 deletions

...r/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java 17 additions, 16 deletions

...er/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/UserServlet.java 19 additions, 16 deletions

...rver/src/ca/nrc/cadc/ac/server/web/users/UserServlet.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/auth/AuthenticatorImpl.java 23 additions, 23 deletions

...ontrol-Server/src/ca/nrc/cadc/auth/AuthenticatorImpl.java
projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/AbstractReaderWriter.java 9 additions, 0 deletions

...sControl/src/ca/nrc/cadc/ac/xml/AbstractReaderWriter.java

with 100 additions and 92 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