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-13 #147

Merged
merged 9 commits into from
Oct 13, 2020
Merged

Integration candidate 2020-10-13 #147

merged 9 commits into from
Oct 13, 2020

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Oct 12, 2020

Describe the contribution
Combines

nasa/PSP#206
nasa/osal#621
nasa/cFE#944
nasa/ci_lab#56
nasa/to_lab#62

Testing performed
Bundle CI - https://github.com/nasa/cFS/pull/147/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 draft October 12, 2020 23:41
@astrogeco astrogeco changed the title Integration candidate Integration candidate 2020-10-13 Oct 13, 2020
@astrogeco astrogeco marked this pull request as ready for review October 13, 2020 20:14
@astrogeco astrogeco merged commit 20097ef into main Oct 13, 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.

1 participant