Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

fad6284f

Commit fad6284f authored 8 years ago by Sara Bertocco

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master'

parents 092f7316 c4ba0ea6

No related branches found

No related tags found

No related merge requests found

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

cadc-access-control-server/build.gradle 2 additions, 2 deletions

cadc-access-control-server/build.gradle
cadc-access-control/build.gradle 3 additions, 2 deletions

cadc-access-control/build.gradle
cadc-access-control/src/main/java/ca/nrc/cadc/ac/GroupURI.java 14 additions, 28 deletions

...access-control/src/main/java/ca/nrc/cadc/ac/GroupURI.java
cadc-access-control/src/main/java/ca/nrc/cadc/ac/client/GMSClient.java 75 additions, 69 deletions

...ontrol/src/main/java/ca/nrc/cadc/ac/client/GMSClient.java
cadc-access-control/src/main/java/ca/nrc/cadc/ac/client/GroupAuthorizer.java 155 additions, 0 deletions

.../src/main/java/ca/nrc/cadc/ac/client/GroupAuthorizer.java
cadc-access-control/src/main/java/ca/nrc/cadc/ac/client/Main.java 26 additions, 44 deletions

...ess-control/src/main/java/ca/nrc/cadc/ac/client/Main.java
cadc-access-control/src/test/java/ca/nrc/cadc/ac/GroupURITest.java 12 additions, 2 deletions

...ss-control/src/test/java/ca/nrc/cadc/ac/GroupURITest.java
cadc-access-control/src/test/java/ca/nrc/cadc/ac/client/GMSClientTest.java 29 additions, 23 deletions

...ol/src/test/java/ca/nrc/cadc/ac/client/GMSClientTest.java

with 316 additions and 170 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