Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

cdbeff2d

Commit cdbeff2d authored 10 years ago by Dustin Jenkins

Downloads
- Plain Diff

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

parents 3477988f a1739694

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/GroupPersistence.java 4 additions, 1 deletion

...ol-Server/src/ca/nrc/cadc/ac/server/GroupPersistence.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java 43 additions, 6 deletions

...l-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupPersistence.java 2 additions, 1 deletion

.../src/ca/nrc/cadc/ac/server/ldap/LdapGroupPersistence.java
projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java 1 addition, 1 deletion

...rver/test/src/ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java
projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java 3 additions, 3 deletions

...test/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java
projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java 3 additions, 3 deletions

.../test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java

with 56 additions and 15 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