Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

d14b38a6

Commit d14b38a6 authored 10 years ago by Jeff Burke

Downloads
- Plain Diff

Merge branch 's1711' of ssh://mach16/srv/cadc/git/wopencadc into s1711

Conflicts:
	projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/GetGroupNamesActionTest.java

parents 9348bed4 37f8f497

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

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

...l-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/GroupsAction.java 8 additions, 9 deletions

...ol-Server/src/ca/nrc/cadc/ac/server/web/GroupsAction.java
projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/GetGroupNamesActionTest.java 12 additions, 10 deletions

...rc/ca/nrc/cadc/ac/server/web/GetGroupNamesActionTest.java
projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java 10 additions, 3 deletions

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

with 36 additions and 28 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