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

Merge changes in Dev into Master #373

Merged
merged 7 commits into from Nov 22, 2022
Merged

Merge changes in Dev into Master #373

merged 7 commits into from Nov 22, 2022

Conversation

epierce
Copy link
Member

@epierce epierce commented Nov 22, 2022

Description

Adding changes from PR #371 into master

Motivation and Context

PR #371 was targeted at dev instead of the master branch. This merges those changes into master.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • [x ] New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • [x ] My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • [x ] All new and existing tests passed.

kabakakao and others added 7 commits November 1, 2022 23:53
This commit pins ctap-keyring-device to 1.0.6, before I'm release a new
v2.0.0 that requires fido2 v1.0.0, which has numerous breaking changes
that would affect gimme-aws-creds.

Once pinned, I'll create a new tag from:
dany74q/ctap-keyring-device#9

Then I'll create a separate PR here which bumps the pinned versions
of fido2 and ctap-keyring-device, along w/ fixing all breaking changes.
Update dev branch with latest version of master
@epierce epierce merged commit a03b111 into master Nov 22, 2022
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.

None yet

5 participants