Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

83b8eadd

Commit 83b8eadd authored 10 years ago by Jeff Burke

Downloads
- Plain Diff

Merge branch 's1651' of ssh://mach16/usr/cadc/dev/git/wopencadc into s1651

parents 1a12ad49 629d4227

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/web/ACSearchRunner.java 23 additions, 34 deletions

...-Server/src/ca/nrc/cadc/ac/server/web/ACSearchRunner.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/GroupsAction.java 14 additions, 12 deletions

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

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

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