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

Merged
merged 4 commits into from
Mar 25, 2022
Merged

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Mar 25, 2022

Checklist (Please check before submitting)

Describe the contribution
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

nasa/elf2cfetbl#108, v3.3.0-rc4+dev18
nasa/tblCRCTool#67, v1.3.0-rc4+dev14
nasa/cFS-GroundSystem#209, v3.0.0-rc4+dev19

Includes

nasa/cFE#2073, Resolve build failure for time cfg source

nasa/osal#1238, avoid calling memchr() with unknown size buffer

nasa/osal#1234, Hotfix IC:Caleum-rc4+dev6

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

nasa/elf2cfetbl#107
nasa/tblCRCTool#66
nasa/cFS-GroundSystem#210

Update Copyright Headers

nasa/cFE#2070
nasa/osal#1236
nasa/PSP#328

nasa/sample_app#169
nasa/sample_lib#78

nasa/ci_lab#106
nasa/to_lab#117
nasa/sch_lab#110

nasa/elf2cfetbl#106
nasa/tblCRCTool#65
nasa/cFS-GroundSystem#208

Testing performed
https://github.com/nasa/cFS/pull/445/checks

CodeQL workflow Failure is being examined

Expected behavior changes

See PRs

System(s) tested on
Ubuntu
RTEMS
CentOS

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
@jphickey
@skliper
@astrogeco

astrogeco added a commit to nasa/sample_app that referenced this pull request Mar 25, 2022
astrogeco added a commit to nasa/PSP that referenced this pull request Mar 25, 2022
astrogeco added a commit to nasa/osal that referenced this pull request Mar 25, 2022
astrogeco added a commit to nasa/cFE that referenced this pull request Mar 25, 2022
astrogeco added a commit to nasa/PSP that referenced this pull request Mar 25, 2022
Part of IC:Caelum-rc4+dev7, nasa/cFS#445
astrogeco added a commit to nasa/PSP that referenced this pull request Mar 25, 2022
Part of IC:Caelum-rc4+dev7, nasa/cFS#445
astrogeco added a commit to nasa/osal that referenced this pull request Mar 25, 2022
astrogeco added a commit to nasa/cFE that referenced this pull request Mar 25, 2022
astrogeco added a commit to nasa/sample_app that referenced this pull request Mar 25, 2022
astrogeco added a commit to nasa/ci_lab that referenced this pull request Mar 25, 2022
astrogeco added a commit to nasa/to_lab that referenced this pull request Mar 25, 2022
astrogeco added a commit to nasa/sch_lab that referenced this pull request Mar 25, 2022
astrogeco added a commit to nasa/sample_lib that referenced this pull request Mar 25, 2022
astrogeco added a commit to nasa/elf2cfetbl that referenced this pull request Mar 25, 2022
@astrogeco astrogeco force-pushed the integration-candidate branch from 1686821 to 4c02793 Compare March 25, 2022 22:19
astrogeco added a commit to nasa/tblCRCTool that referenced this pull request Mar 25, 2022
astrogeco added a commit to nasa/cFS-GroundSystem that referenced this pull request Mar 25, 2022
astrogeco and others added 2 commits March 25, 2022 19:11
Co-authored-by: Jacob Hageman <skliper@users.noreply.github.com>
Co-authored-by: Joseph Hickey <jphickey@users.noreply.github.com>
@astrogeco astrogeco force-pushed the integration-candidate branch from 4c02793 to df166c3 Compare March 25, 2022 23:15
**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

nasa/elf2cfetbl#108, v3.3.0-rc4+dev18
nasa/tblCRCTool#67, v1.3.0-rc4+dev14
nasa/cFS-GroundSystem#209, v3.0.0-rc4+dev19

**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

nasa/elf2cfetbl#107
nasa/tblCRCTool#66
nasa/cFS-GroundSystem#210

*Update Copyright Headers*

nasa/cFE#2070
nasa/osal#1236
nasa/PSP#328

nasa/sample_app#169
nasa/sample_lib#78

nasa/ci_lab#106
nasa/to_lab#117
nasa/sch_lab#110

nasa/elf2cfetbl#106
nasa/tblCRCTool#65
nasa/cFS-GroundSystem#208

Co-authored-by: Jacob Hageman <skliper@users.noreply.github.com>
@astrogeco astrogeco force-pushed the integration-candidate branch from df166c3 to e700f0c Compare March 25, 2022 23:31
@astrogeco astrogeco merged commit 963b3ab into main Mar 25, 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.

1 participant