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

cFS Bundle Integration Candidate: 2020-12-22 #162

Merged
merged 1 commit into from
Dec 18, 2020
Merged

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Dec 14, 2020

Describe the contribution
Integration Candidate 2020-12-22 AND 2020-12-15

Combines

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

Expected behavior changes
See submodule Integration Candidate PRs

System(s) tested on
Ubuntu 18.04

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
@zanzaben
@ArielSAdamsNASA

@astrogeco astrogeco changed the title cFS Bundle Integration Candidate: 2020-12-15 cFS Bundle Integration Candidate: 2020-12-22 Dec 18, 2020
@astrogeco astrogeco marked this pull request as ready for review December 18, 2020 17:27
@astrogeco astrogeco merged commit 9211067 into main Dec 18, 2020
chillfig pushed a commit to chillfig/cFS that referenced this pull request Mar 17, 2022
Fix nasa#161, disable the engine in CF_CFDP_DisableEngine
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