Merged
Conversation
*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 <jphickey@users.noreply.github.com> Co-authored by: Jacob Hageman <skliper@users.noreply.github.com> Co-authored by: Jose Martinez Pedraza <pepepr08@users.noreply.github.com>
dzbaker
force-pushed
the
integration-candidate
branch
from
63d70fe to
7ad4504
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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