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

IC: Caelum-rc4+dev15 #536

Merged
merged 1 commit into from
Aug 4, 2022
Merged

IC: Caelum-rc4+dev15 #536

merged 1 commit into from
Aug 4, 2022

Conversation

dzbaker
Copy link
Contributor

@dzbaker dzbaker commented Aug 4, 2022

Checklist (Please check before submitting)

Describe the contribution

Combines:

cfe v7.0.0-rc4+dev157
osal v6.0.0-rc4+dev103

Includes

Testing performed
Bundle Checks https://github.com/nasa/cFS/pull/536/checks

Expected behavior changes
See PRs

System(s) tested on
Ubuntu 18.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
@pepepr08

*Combines:*

cfe v7.0.0-rc4+dev157
osal v6.0.0-rc4+dev103

*Includes*
- nasa/cFE#2129, use correct loop var in add_cfe_app_dependency
- nasa/cFE#2117, Automatic suppression of flooding events
- nasa/cFE#2126, Remove stray TODO in UT
- nasa/osal#1274, Remove stray terminators
- nasa/osal#1276, Add RTEMS timebase callback wrapper

Co-authored by: Joseph Hickey  <[email protected]>
Co-authored by: Jacob Hageman  <[email protected]>
Co-authored by: Jose Martinez Pedraza <[email protected]>
@dzbaker dzbaker merged commit 6b2894c into main Aug 4, 2022
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