Skip to content

Conversation

@dzbaker
Copy link
Contributor

@dzbaker dzbaker commented Jan 31, 2024

Checklist (Please check before submitting)

Describe the contribution

Combines:

cFE equuleus-rc1+dev84
osal equuleus-rc1+dev41

Includes:

cFE

osal

Testing performed

Bundle Checks https://github.com/nasa/cFS/pull/735/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+dev84
osal equuleus-rc1+dev41

**Includes:**

*cFE*
- nasa/cFE#2505

*osal*
- nasa/osal#1368

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 8b6d6f7 to 3c13e41 Compare January 31, 2024 18:57
@dzbaker dzbaker merged commit a0c35aa into main Jan 31, 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