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

HOTFIX #2066: Revert changes to versioning information #2071

Merged
merged 1 commit into from
Mar 25, 2022

Conversation

astrogeco
Copy link
Contributor

Describe the contribution

Per conversation in CCB:2022-03-24 and in e5be061#commitcomment-69358417

Ensuring REVISION number is set to 99
Correct cfs_versions.dox appropriately.

Testing performed
Text and documentation only

Expected behavior changes
No behavior change

System(s) tested on
n/a

Additional context
e5be061#commitcomment-69358417

Third party code
none

Contributor Info - All information REQUIRED for consideration of pull request
Gerardo E. Cruz-Ortiz, NASA

@astrogeco astrogeco force-pushed the standardize-version.h branch 2 times, most recently from 4b383e0 to da399f3 Compare March 24, 2022 21:12
*/
#define CFE_MISSION_REV 0
#define CFE_MISSION_REV 0xFF

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1-254 you mean? 0 and 255 we've claimed. You could just reference the issue? Not sure how helpful that is though.

@astrogeco astrogeco force-pushed the standardize-version.h branch 2 times, most recently from 697ad0a to fcbabc3 Compare March 24, 2022 22:32
astrogeco added a commit that referenced this pull request Mar 25, 2022
HOTFIX: Revert changes to versioning information
@astrogeco astrogeco force-pushed the standardize-version.h branch 2 times, most recently from aa7724a to cf698a1 Compare March 25, 2022 19:28
@astrogeco astrogeco changed the title HOTFIX: Revert changes to versioning information HOTFIX #2066: Revert changes to versioning information Mar 25, 2022
astrogeco added a commit that referenced this pull request Mar 25, 2022
HOTFIX #2066: Revert changes to versioning information
Add link to cfs_versions.dox for documentation
Add note on CFE_MISSION_REV status (nasa/cFS#440)
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 fb8d6f3 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>
@skliper skliper added this to the Draco milestone Mar 28, 2022
@astrogeco astrogeco deleted the standardize-version.h branch April 18, 2022 18:30
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.

2 participants