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

UCO Issues 562, 586, 590: Bump UCO to current state of develop-2.0.0 #155

Merged
merged 6 commits into from
Jun 18, 2024

Conversation

ajnelson-nist
Copy link
Member

This PR does not require committee processing for merging. It should pass CI and receive an approving review, though.

This PR is part of delivering UCO Issues 562, 586, and 590 via the CASE website.

This PR also catches CASE's develop-2.0.0 up with develop, including handling Git submodule logistics.

ajnelson-nist and others added 6 commits June 10, 2024 09:11
No effects were observed on Make-managed files.

References:
* ucoProject/UCO#586
* ucoProject/UCO#590

Signed-off-by: Alex Nelson <[email protected]>
UCO Issues 586, 590: Bump UCO to current state of develop
No effects were observed on Make-managed files.

References:
* ucoProject/UCO#586
* ucoProject/UCO#609

Signed-off-by: Alex Nelson <[email protected]>
UCO Issue 586: Bump UCO to current state of `develop`
No effects were observed on Make-managed files.

References:
* ucoProject/UCO#562
* ucoProject/UCO#586
* ucoProject/UCO#590

Signed-off-by: Alex Nelson <[email protected]>
@ajnelson-nist ajnelson-nist added this to the CASE 2.0.0 milestone Jun 18, 2024
@ajnelson-nist
Copy link
Member Author

This PR is ready for review and merge.

@ajnelson-nist ajnelson-nist marked this pull request as ready for review June 18, 2024 11:53
@ajnelson-nist ajnelson-nist requested a review from a team June 18, 2024 11:53
Copy link
Contributor

@plbt5 plbt5 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assuming this merge doesn't include changes that have not yet been reviewed, the merge is approved.
In order to allow @ajnelson-nist to falsify this assumption, I'll leave the actual merge to him (providing such is allowed by our rules of conduct).

@plbt5 plbt5 merged commit d5a8130 into develop-2.0.0 Jun 18, 2024
1 check passed
@plbt5 plbt5 deleted the UCO-Features-Issues-562-586-590-2.0.0 branch June 18, 2024 12:12
@ajnelson-nist
Copy link
Member Author

@plbt5 Our 2-key protocol is the submitter doesn't typically merge. This leaves 2-key easier to see in the Git history offline from GitHub.

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.

2 participants