Skip to content

Conversation

@dzbaker
Copy link
Contributor

@dzbaker dzbaker commented Mar 21, 2024

Checklist (Please check before submitting)

Describe the contribution

Combines:

cFE equuleus-rc1+dev114
sample_app equuleus-rc1+dev46

Includes:

cFE

sample_app

Testing performed

Bundle Checks https://github.com/nasa/cFS/pull/752/checks

Expected behavior changes
See PRs

System(s) tested on
Ubuntu 20.04

Additional context
None

Code contributions
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
@thnkslprpt

*Combines:*

cFE equuleus-rc1+dev114
sample_app equuleus-rc1+dev46

**Includes:**

*cFE*
- nasa/cFE#2387
- nasa/cFE#2531

*sample_app*
- nasa/sample_app#218
- nasa/sample_app#216

Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored by: Avi Weiss <thnkslprpt@users.noreply.github.com>
@dzbaker dzbaker force-pushed the integration-candidate branch from 20334c8 to 5b678e2 Compare March 21, 2024 20:28
@dzbaker dzbaker merged commit e8f410d into main Mar 21, 2024
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