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

Integration Candidate: 2020-10-20 #152

Merged
merged 6 commits into from
Oct 21, 2020
Merged

Integration Candidate: 2020-10-20 #152

merged 6 commits into from
Oct 21, 2020

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Oct 20, 2020

Describe the contribution
Combines
nasa/PSP#209
nasa/cFE#959
nasa/osal#627

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

Expected behavior changes
See submodule PRs

System(s) tested on
Ubuntu CI

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

@astrogeco astrogeco marked this pull request as ready for review October 21, 2020 22:17
@astrogeco astrogeco merged commit 3a76845 into main Oct 21, 2020
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.

2 participants