Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

9e647a79

Commit 9e647a79 authored 9 years ago by Jeff Burke

Downloads
- Plain Diff

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

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

parents 93ec644a 4953170d

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

projects/cadcAccessControl-Server/build.xml 2 additions, 1 deletion

projects/cadcAccessControl-Server/build.xml
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java 14 additions, 13 deletions

...er/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/UserActionFactory.java 2 additions, 1 deletion

...rc/ca/nrc/cadc/ac/server/web/users/UserActionFactory.java
projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/RequestValidatorTest.java 6 additions, 3 deletions

.../test/src/ca/nrc/cadc/ac/server/RequestValidatorTest.java
projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/AddUserMemberActionTest.java 4 additions, 2 deletions

...rc/cadc/ac/server/web/groups/AddUserMemberActionTest.java
projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberActionTest.java 5 additions, 2 deletions

...cadc/ac/server/web/groups/RemoveUserMemberActionTest.java
projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/UserClient.java 44 additions, 116 deletions

...dcAccessControl/src/ca/nrc/cadc/ac/client/UserClient.java
projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/AbstractReaderWriter.java 3 additions, 1 deletion

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

with 80 additions and 139 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