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

cFE Integration candidate: Caelum-rc4+dev6 #2066

Merged
merged 4 commits into from
Mar 16, 2022
Merged

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Mar 16, 2022

Describe the contribution

PR #2066

PR #2058

Testing performed

cFE Checks https://github.com/nasa/cFE/pull/2066/checks
cFS Bundle Checks https://github.com/nasa/cFE/pull/2066/checks

Expected behavior changes
See PRs

System(s) tested on
Ubuntu 18.04
RTEMS 4.11/5 (bundle)

Additional context
Part of nasa/cFS#443

Docs build will fail until bundle IC is merged, see successful build at https://github.com/nasa/cFS/actions/runs/1995027651

Third party code
None

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

@astrogeco astrogeco marked this pull request as ready for review March 16, 2022 21:35
@astrogeco astrogeco force-pushed the integration-candidate branch 2 times, most recently from f691d1a to e8d50ff Compare March 16, 2022 21:47
IC: Caelum-rc4+dev6, nasa/cFS#443

- Reverts development version identifier to 99 for revision number
@astrogeco astrogeco force-pushed the integration-candidate branch from e8d50ff to e5be061 Compare March 16, 2022 21:55
@astrogeco astrogeco merged commit a39b0a6 into main Mar 16, 2022
astrogeco added a commit to nasa/cFS that referenced this pull request Mar 16, 2022
Combines

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

Co-authored by:

Jacob Hageman   <[email protected]>
Justin Figueroa <[email protected]>
astrogeco added a commit to nasa/cFS that referenced this pull request Mar 16, 2022
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 added a commit to nasa/cFS that referenced this pull request Mar 16, 2022
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 added a commit that referenced this pull request Mar 25, 2022
Add link to cfs_versions.dox for documentation
Add note on CFE_MISSION_REV status (nasa/cFS#440)
astrogeco added a commit that referenced this pull request Mar 25, 2022
HOTFIX #2066: Revert changes to versioning information
astrogeco added a commit that referenced this pull request Mar 25, 2022
Add link to cfs_versions.dox for documentation
Add note on CFE_MISSION_REV status (nasa/cFS#440)
astrogeco added a commit that referenced this pull request Mar 25, 2022
HOTFIX #2066: Revert changes to versioning information
@skliper skliper added this to the Draco milestone Mar 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants