Skip to content

Conversation

@dzbaker
Copy link
Contributor

@dzbaker dzbaker commented Mar 28, 2024

Checklist (Please check before submitting)

Describe the contribution

Combines:

cFE equuleus-rc1+dev120
osal equuleus-rc1+dev62

Includes:

cFE

osal

Testing performed

Bundle Checks https://github.com/nasa/cFS/pull/753/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
@skliper

@dzbaker dzbaker force-pushed the integration-candidate branch from cb218c3 to de4e6b5 Compare April 1, 2024 14:06
*Combines:*

cFE equuleus-rc1+dev120
osal equuleus-rc1+dev62

**Includes:**

*cFE*
- nasa/cFE#2535
- nasa/cFE#2539

*osal*
- nasa/osal#1350

Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored by: Jacob Hageman <skliper@users.noreply.github.com>
@dzbaker dzbaker force-pushed the integration-candidate branch from de4e6b5 to c4af2ea Compare April 1, 2024 14:26
@dzbaker dzbaker merged commit 57c6ac6 into main Apr 1, 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