cFE Integration candidate: Caelum-rc4+dev6 #2066
Merged
Conversation
This file contains 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
Fix #2064, Use osal-common.doxygen to resolve OSAL Doxygen refs
2 tasks
astrogeco
force-pushed
the
integration-candidate
branch
2 times, most recently
from
f691d1a to
e8d50ff
Compare
IC: Caelum-rc4+dev6, nasa/cFS#443 - Reverts development version identifier to 99 for revision number
astrogeco
force-pushed
the
integration-candidate
branch
from
e8d50ff to
e5be061
Compare
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Mar 16, 2022
Combines nasa/cFE#2066, v7.0.0-rc4+dev87 nasa/osal#1233, v6.0.0-rc4+dev54 Co-authored by: Jacob Hageman <skliper@users.noreply.github.com> Justin Figueroa <chillfig@users.noreply.github.com>
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Mar 16, 2022
Combines: nasa/cFE#2066, v7.0.0-rc4+dev87 nasa/osal#1233, v6.0.0-rc4+dev54 Co-authored by: Jacob Hageman <skliper@users.noreply.github.com> Co-authored by: Justin Figueroa <chillfig@users.noreply.github.com>
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Mar 16, 2022
Combines: nasa/cFE#2066, v7.0.0-rc4+dev87 nasa/osal#1233, v6.0.0-rc4+dev54 Co-authored-by: Jacob Hageman <skliper@users.noreply.github.com> Co-authored-by: Justin Figueroa <chillfig@users.noreply.github.com>
astrogeco
added a commit
that referenced
this pull request
Mar 25, 2022
Add link to cfs_versions.dox for documentation Add note on CFE_MISSION_REV status (nasa/cFS#440)
astrogeco
added a commit
that referenced
this pull request
Mar 25, 2022
HOTFIX #2066: Revert changes to versioning information
astrogeco
added a commit
that referenced
this pull request
Mar 25, 2022
Add link to cfs_versions.dox for documentation Add note on CFE_MISSION_REV status (nasa/cFS#440)
astrogeco
added a commit
that referenced
this pull request
Mar 25, 2022
HOTFIX #2066: Revert changes to versioning information
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
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.
Describe the contribution
PR #2066
PR #2058
mainpageif needed should not contain unique content, just references #2055, Refactor doxygen mainpage into frontpageTesting performed
cFE Checks https://github.com/nasa/cFE/pull/2066/checks
cFS Bundle Checks https://github.com/nasa/cFE/pull/2066/checks
Expected behavior changes
See PRs
System(s) tested on
Ubuntu 18.04
RTEMS 4.11/5 (bundle)
Additional context
Part of nasa/cFS#443
Docs build will fail until bundle IC is merged, see successful build at https://github.com/nasa/cFS/actions/runs/1995027651
Third party code
None
Contributor Info - All information REQUIRED for consideration of pull request
@skliper