Skip to content

Comments

IC: Caelum-rc4+dev52#677

Merged
dzbaker merged 5 commits intomainfrom
integration-candidate
Jun 1, 2023
Merged

IC: Caelum-rc4+dev52#677
dzbaker merged 5 commits intomainfrom
integration-candidate

Conversation

@dzbaker
Copy link
Contributor

@dzbaker dzbaker commented May 26, 2023

Checklist (Please check before submitting)

Describe the contribution

Combines:

cFE v7.0.0-rc4+dev334
osal v6.0.0-rc4+dev217

Includes:

cFS

cFE

osal

Testing performed

Bundle Checks https://github.com/nasa/cFS/pull/677/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
@dmknutsen
@CDKnightNASA
@chillfig

@dzbaker dzbaker force-pushed the integration-candidate branch 7 times, most recently from fd1e79f to e62cdc2 Compare May 30, 2023 15:52
@dzbaker dzbaker force-pushed the integration-candidate branch from 1ce28e9 to eea5d66 Compare June 1, 2023 19:34
*Combines:*

cFE v7.0.0-rc4+dev334
osal v6.0.0-rc4+dev217

**Includes:**

*cFS*
- #680
- #676

*cFE*
- nasa/cFE#2350
- nasa/cFE#2354
- nasa/cFE#2355
- nasa/cFE#2366
- nasa/cFE#2364
- nasa/cFE#2356
- nasa/cFE#2361

*osal*
- nasa/osal#1393

Co-authored by: Daniel Knutsen <dmknutsen@users.noreply.github.com>
Co-authored by: Justin Figueroa <chillfig@users.noreply.github.com>
Co-authored by: Chris Knight <cdknightnasa@users.noreply.github.com>
@dzbaker dzbaker force-pushed the integration-candidate branch from eea5d66 to dd8dbfb Compare June 1, 2023 20:57
@dzbaker dzbaker merged commit 30b5527 into main Jun 1, 2023
@dzbaker dzbaker added this to the v7.0.0 milestone Feb 12, 2026
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