Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes from zvelo #636

Merged
merged 9 commits into from
Oct 25, 2017
Merged

Changes from zvelo #636

merged 9 commits into from
Oct 25, 2017

Conversation

aeneasr
Copy link
Member

@aeneasr aeneasr commented Oct 25, 2017

No description provided.

joshuarubin and others added 8 commits October 11, 2017 09:34
* fix go-jose

Signed-off-by: Joshua Rubin <[email protected]>

* add Gopkg.toml

Signed-off-by: Joshua Rubin <[email protected]>

* add tests for dep

Signed-off-by: Joshua Rubin <[email protected]>

* fix glide build

Signed-off-by: Joshua Rubin <[email protected]>
* add ability to list all groups

Signed-off-by: Joshua Rubin <[email protected]>

* update based on review comments

Signed-off-by: Joshua Rubin <[email protected]>

* a few more updates from review

Signed-off-by: Joshua Rubin <[email protected]>

* ensure group lists dont return nil

Signed-off-by: Joshua Rubin <[email protected]>
Signed-off-by: Joshua Rubin <[email protected]>
Signed-off-by: Joshua Rubin <[email protected]>
Signed-off-by: Joshua Rubin <[email protected]>
Signed-off-by: Joshua Rubin <[email protected]>
Signed-off-by: Joshua Rubin <[email protected]>
@aeneasr aeneasr changed the base branch from master to cryptopasta October 25, 2017 13:53
# Conflicts:
#	.travis.yml
#	Gopkg.toml
#	glide.yaml
#	jwk/generator_hs256.go
#	jwk/generator_test.go
#	jwk/handler.go
#	jwk/manager_test_helpers.go
@aeneasr aeneasr merged commit dd6acc2 into cryptopasta Oct 25, 2017
@aeneasr aeneasr deleted the changes-from-zvelo branch October 25, 2017 14:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants