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

osal Integration candidate: Caelum-rc4+dev6 #1233

Merged
merged 9 commits into from
Mar 16, 2022
Merged

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Mar 16, 2022

Describe the contribution

PR #1230

PR #1221

PR #1232

PR #1228 from skliper/fix1227-doxygen_mainpage

Testing performed

osal Checks https://github.com/nasa/osal/pull/1233/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

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request
@skliper
@chillfig

ezpollack and others added 8 commits March 7, 2022 20:03
…-rtems

Fix #1220 Implement OS_ModuleGetInfo_Impl for RTEMS
- Add aliased typedef to handle renames from RTEMS 4.11 to RTEMS 5
- Cast to cpuaddress before assignment to `OS_module_address_t` elements
changes tests input to boolean, changes source input for uses, adds new lines
component-path to osal, changes tests to test, removes makeprep input
Partial #1225, Update cFS-build CodeQL reusable worfklow target
Fix #1231, Doxygen strip path and expose common config
@astrogeco astrogeco changed the title Integration candidate osal Integration candidate: Caelum-rc4+dev6 Mar 16, 2022
@astrogeco astrogeco marked this pull request as ready for review March 16, 2022 21:36
IC: Caelum-rc4+dev6, nasa/cFS#443

- Reverts development version identifier to 99 for revision number
@astrogeco astrogeco merged commit fafb045 into main Mar 16, 2022
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>
@skliper skliper added this to the Draco milestone Mar 25, 2022
astrogeco added a commit that referenced this pull request Mar 25, 2022
HOTFIX #1233, Revert changes to versioning information
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants