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

Fix #1010, CFE_ES_RegisterCDSEx stub update #1011

Conversation

skliper
Copy link
Contributor

@skliper skliper commented Nov 12, 2020

Describe the contribution
Fix #1010 - update CFE_ES_RegisterCDSEx stub to match current signature

Testing performed
Built and ran unit tests, all pass

Expected behavior changes
None, except stub match.

System(s) tested on

  • Hardware: cFS Dev Server
  • OS: Ubuntu 18.04
  • Versions: Bundle + this commit

Additional context
None

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman - NASA/GSFC

@skliper skliper added this to the 7.0.0 milestone Nov 12, 2020
@skliper
Copy link
Contributor Author

skliper commented Nov 12, 2020

Even when I did it completely wrong (in f3501e0) it didn't fail...

@astrogeco
Copy link
Contributor

CCB 2020-11-12 APPROVED
@jphickey Will check why this didn't trigger a failure

@skliper skliper force-pushed the fix1010-cfe_es_registercdsex-stub branch from f3501e0 to 53d0422 Compare November 12, 2020 17:37
@skliper
Copy link
Contributor Author

skliper commented Nov 12, 2020

It's defined in cfe_private.h, which wasn't being included, I'll add.

@astrogeco astrogeco changed the base branch from main to integration-candidate November 13, 2020 19:46
@astrogeco astrogeco merged commit d7b5839 into nasa:integration-candidate Nov 13, 2020
astrogeco added a commit to astrogeco/cFS that referenced this pull request Nov 13, 2020
astrogeco added a commit to nasa/cFS that referenced this pull request Nov 16, 2020
* Add nasa/cFE#984

* Add nasa/cFE#980

* Add nasa/cFE#867

* Add nasa/osal#638 and update cfe due to rebase

* Add nasa/cFE#987

* Add nasa/to_lab#64 and nasa/sample_app#104

* Add nasa/osal#643

* Add nasa/cFE#1000

* Add nasa/ci_lab#58

* Add doxygen fixes for nasa/osal#643

* Add nasa/cFE#1013

* Add nasa/cFE#1011

* Add nasa/ci_lab#61

* Add nasa/sample_app#109

* Bump versions and point to submodules main

Co-authored-by: Joseph Hickey <[email protected]>
@skliper skliper deleted the fix1010-cfe_es_registercdsex-stub branch February 1, 2021 22:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CFE_ES_RegisterCDSEx stub mismatch
2 participants