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+dev7 #2074

Merged
merged 8 commits into from
Mar 25, 2022
Merged

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Mar 25, 2022

Describe the contribution

PR #2070

PR #2073

PR #2071

Testing performed
cFE Checks https://github.com/nasa/cFE/pull/2074/checks
cFS Bundle checks https://github.com/nasa/cFS/445/checks

Failed CodeQL Workflow is being examined

Expected behavior changes
See PRs

System(s) tested on
Ubuntu
RTEMS

Additional context
Part of nasa/cFS#445

Third party code
None

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

Add link to cfs_versions.dox for documentation
Add note on CFE_MISSION_REV status (nasa/cFS#440)
HOTFIX #2066: Revert changes to versioning information
astrogeco added a commit to nasa/cFS that referenced this pull request Mar 25, 2022
**Combines**

nasa/cFE#2074, v7.0.0-rc4+dev94
nasa/osal#1239, v6.0.0-rc4+dev66
nasa/PSP#330, v1.6.0-rc4+dev21

nasa/ci_lab#107, v2.5.0-rc4+dev17
nasa/sample_app#171, v1.3.0-rc4+dev16
nasa/sample_lib#80, v1.3.0-rc4+dev16
nasa/to_lab#119, v2.5.0-rc4+dev16
nasa/sch_lab#112, v2.5.0-rc4+dev23

**Includes**

*Standardize Version Information*

nasa/cFE#2071
nasa/osal#1240
nasa/PSP#329

nasa/sample_app#170
nasa/sample_lib#79

nasa/ci_lab#108
nasa/to_lab#118
nasa/sch_lab#111

*Update Copyright Headers*

nasa/PSP#328

nasa/sample_app#169
nasa/sample_lib#78

nasa/ci_lab#106
nasa/to_lab#117
nasa/sch_lab#110
astrogeco added a commit to nasa/cFS that referenced this pull request Mar 25, 2022
astrogeco added a commit to nasa/cFS that referenced this pull request Mar 25, 2022
@astrogeco astrogeco merged commit a6c6b65 into main Mar 25, 2022
astrogeco added a commit to nasa/cFS that referenced this pull request Mar 25, 2022
@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
Development

Successfully merging this pull request may close these issues.

Build failure with CFE_PLATFORM_TIME_CFG_SRC_TIME == true Apply latest copyright header
2 participants