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

Bootes RC-2 Integration #149

Merged
merged 1 commit into from
Oct 14, 2020

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Oct 13, 2020

Describe the contribution
Combines

nasa/osal#587
nasa/cFE#856

Testing performed
Built and ran locally
Built in CI, https://travis-ci.com/github/nasa/cFS/builds/189839413

Expected behavior changes
OSAL and cFE revision version number now reports 99 in housekeeping telemetry for development builds.

System(s) tested on
Built and ran on Docker container.

Additional context
None

Code contibutions
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
@astrogeco

@astrogeco astrogeco marked this pull request as ready for review October 14, 2020 14:11
@astrogeco astrogeco merged commit e522b04 into nasa:bootes.x Oct 14, 2020
@astrogeco astrogeco deleted the set-revision-to-99-bootes branch January 4, 2021 15:01
chillfig pushed a commit to chillfig/cFS that referenced this pull request Mar 17, 2022
Renames all remaining identifiers that did not have an appropriate
name per the coding standards.  Specifically, this is anything
that did not start with CF prefix (nasa#149) and anything that
ended with an underscore only (#110).
chillfig pushed a commit to chillfig/cFS that referenced this pull request Mar 17, 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