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-11-03 #154

Merged
merged 13 commits into from
Nov 4, 2020
Merged

Integration Candidate: 2020-11-03 #154

merged 13 commits into from
Nov 4, 2020

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Oct 30, 2020

Describe the contribution

Combines
nasa/cFE#991
nasa/osal#639
nasa/PSP#213
nasa/sample_app#102
nasa/sample_lib#35

Testing performed
See framework-bundle CI: https://github.com/nasa/cFS/pull/154/checks

Expected behavior changes
See bundled 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
@skliper
@jphickey
@asgibson

@astrogeco astrogeco marked this pull request as ready for review November 4, 2020 14:38
@astrogeco astrogeco merged commit 6c0f9bd into main Nov 4, 2020
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