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

cFS Integration Candidate: Caelum-rc4+dev6 #443

Merged
merged 6 commits into from
Mar 17, 2022
Merged

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Mar 16, 2022

Checklist (Please check before submitting)

Describe the contribution

Combines

nasa/cFE#2066, v7.0.0-rc4+dev87
nasa/osal#1233, v6.0.0-rc4+dev54

Doxygen Changes:

PR #442

Testing performed
cFS Bundle Checks
cFE Checks
osal Checks

Expected behavior changes
See PRs

System(s) tested on
Ubuntu 18.04
RTEMS 4.11, 5..0

Additional context
None

Code contributions
The cFS repository is provided to bundle the cFS Framework. It is utilized for bundling submodules, continuous integration testing, and version management and does not contain any software. Code contributions should be directed to the appropriate submodule.

Contributor Info - All information REQUIRED for consideration of pull request
skliper
chillfig

@astrogeco astrogeco changed the title cFS Integration Candidate: Caelum+Dev6 cFS Integration Candidate: Caelum-rc4+Dev6 Mar 16, 2022
@astrogeco astrogeco changed the title cFS Integration Candidate: Caelum-rc4+Dev6 cFS Integration Candidate: Caelum-rc4+dev6 Mar 16, 2022
astrogeco added a commit to nasa/osal that referenced this pull request Mar 16, 2022
IC: Caelum-rc4+dev6, nasa/cFS#443

- Reverts development version identifier to 99 for revision number
astrogeco added a commit to nasa/cFE that referenced this pull request Mar 16, 2022
IC: Caelum-rc4+dev6, nasa/cFS#443

- Reverts development version identifier to 99 for revision number
astrogeco added a commit to nasa/cFE that referenced this pull request Mar 16, 2022
IC: Caelum-rc4+dev6, nasa/cFS#443

- Reverts development version identifier to 99 for revision number
Combines:

nasa/cFE#2066, v7.0.0-rc4+dev87
nasa/osal#1233, v6.0.0-rc4+dev54

Co-authored-by: Jacob Hageman   <[email protected]>
Co-authored-by: Justin Figueroa <[email protected]>
@astrogeco astrogeco marked this pull request as ready for review March 16, 2022 22:07
@astrogeco astrogeco merged commit eb32159 into main Mar 17, 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.

Fix workflow documentation directory for OSAL dox updates
2 participants