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 Issue 556, Release 1.3.0: Bump UCO to current state of develop-2.0.0 #150

Merged
merged 12 commits into from
Feb 2, 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 Issue 556 via the CASE website.

ajnelson-nist and others added 12 commits January 23, 2024 10:06
No effects were observed on Make-managed files.

References:
* ucoProject/UCO#579

Signed-off-by: Alex Nelson <[email protected]>
This ports the patch from UCO PR 579.

References:
* ucoProject/UCO#579

Signed-off-by: Alex Nelson <[email protected]>
A follow-on patch will regenerate Make-managed files.

Signed-off-by: Alex Nelson <[email protected]>
A follow-on patch will regenerate Make-managed files.

Signed-off-by: Alex Nelson <[email protected]>
Signed-off-by: Alex Nelson <[email protected]>
No effects were observed on Make-managed files.

Signed-off-by: Alex Nelson <[email protected]>
No effects were observed on Make-managed files.

References:
* ucoProject/UCO#556

Signed-off-by: Alex Nelson <[email protected]>
This merge also resolves a merge-conflict with the UCO submodule,
simultaneously updating it to point to UCO's develop-2.0.0 branch that
has caught up with UCO's `develop` immediately after the 1.3.0 release.
@ajnelson-nist ajnelson-nist added this to the CASE 2.0.0 milestone Feb 1, 2024
@ajnelson-nist ajnelson-nist marked this pull request as ready for review February 1, 2024 15:35
@ajnelson-nist
Copy link
Member Author

This PR is ready for review and merge.

@ajnelson-nist ajnelson-nist requested a review from a team February 1, 2024 15:36
@plbt5 plbt5 merged commit 76784bc into develop-2.0.0 Feb 2, 2024
1 check passed
@ajnelson-nist
Copy link
Member Author

With apologies, I just saw that commit 30b14d5 was incorrectly titled due to reusing a Git message file. It should have been titled "Bump UCO to updated state of develop-2.0.0", but reads "Bump UCO to updated state of unstable-2.0.0". The effect, though, was correct, and UCO's unstable-2.0.0 was not merged into develop-2.0.0.

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

2 participants