Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

301dd27a

Commit 301dd27a authored 9 years ago by Brian Major

Downloads
- Plain Diff

Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2

parents 45428647 044153d8

Branches

Tags

No related merge requests found

Changes 4

Show whitespace changes

Inline Side-by-side

Showing

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/UserPersistence.java 16 additions, 0 deletions

...rol-Server/src/ca/nrc/cadc/ac/server/UserPersistence.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java 13 additions, 4 deletions

...ol-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java 30 additions, 1 deletion

...r/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/LoginServlet.java 159 additions, 0 deletions

...ver/src/ca/nrc/cadc/ac/server/web/users/LoginServlet.java

with 218 additions and 5 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