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

Issue 632, PRs 638, 639, 642: Catch develop-2.0.0 up to develop #643

Merged
merged 10 commits into from
Nov 8, 2024

Conversation

ajnelson-nist
Copy link
Contributor

This is a maintenance, catch-up Pull Request, incorporating no new features. Once CI passes, it can be merged.

This PR is being handled with a new branch to address merge conflicts.

ajnelson-nist and others added 10 commits September 13, 2024 11:30
A follow-on patch will regenerate Make-managed files.

References:
* #632

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
References:
* #632

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
…_files

Regenerate example-validation files
No effects were observed on Make-managed files.

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
Issue 632: Prepare OperatingSystem to become a subclass of Software
@ajnelson-nist
Copy link
Contributor Author

This PR is ready for review and merge.

@ajnelson-nist ajnelson-nist marked this pull request as ready for review November 8, 2024 14:22
@ajnelson-nist ajnelson-nist requested a review from a team November 8, 2024 14:22
@ajnelson-nist ajnelson-nist linked an issue Nov 8, 2024 that may be closed by this pull request
15 tasks
@plbt5 plbt5 merged commit 760b995 into develop-2.0.0 Nov 8, 2024
1 check passed
@plbt5 plbt5 deleted the Features-Issue-632-PRs-638-639-642 branch November 8, 2024 15:37
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.

Operating systems should be recognized as specializations of software
4 participants