Skip to content

psp Integration candidate: Caelum-rc4+dev7#330

Merged
astrogeco merged 6 commits into
mainfrom
integration-candidate
Mar 25, 2022
Merged

psp Integration candidate: Caelum-rc4+dev7#330
astrogeco merged 6 commits into
mainfrom
integration-candidate

Conversation

@astrogeco

@astrogeco astrogeco commented Mar 25, 2022

Copy link
Copy Markdown
Contributor

Describe the contribution
PR #328

PR #329

Testing performed
psp Checks https://github.com/nasa/PSP/pull/330/checks
cFS Bundle checks https://github.com/nasa/cFS/445/checks

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 astrogeco changed the title Integration candidate psp Integration candidate: Caelum-rc4+dev7 Mar 25, 2022
HOTFIX #318, Standardize versioning information
@astrogeco astrogeco force-pushed the integration-candidate branch from 95aea30 to 8e998dd Compare March 25, 2022 21:03
Part of IC:Caelum-rc4+dev7, nasa/cFS#445
@astrogeco astrogeco force-pushed the integration-candidate branch from 8e998dd to 8f229c8 Compare March 25, 2022 21:04
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
**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 merged commit e3d28d8 into main Mar 25, 2022
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

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>
@dzbaker dzbaker added this to the v7.0.0 milestone Feb 12, 2026
segeljakt pushed a commit to LeoDOS-Project/LeoDOS that referenced this pull request Mar 22, 2026
**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>
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.

Apply latest copyright header

2 participants