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 #724, #722, rename ut clear force fail #725

Merged

Conversation

zanzaben
Copy link
Contributor

@zanzaben zanzaben commented Jan 4, 2021

Describe the contribution
Fixes #724
Rename UT_ClearForceFail to UT_ClearDefaultValue

Fixes #722
Update the comments of UT_SetDefaultReturnValue to match the more general function

Testing performed
Build and run unit test

Expected behavior changes
No impact to behavior

Additional context
There will be more pull requests from other sub modules that are dependant on this.

System(s) tested on
Ubuntu 20.04

Contributor Info - All information REQUIRED for consideration of pull request
Alex Campbell GSFC

@astrogeco astrogeco added CCB-20210106 and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Jan 6, 2021
@astrogeco
Copy link
Contributor

CCB 2021-01-06 APPROVED

@astrogeco
Copy link
Contributor

Please fix issue title format

@zanzaben zanzaben changed the title Fix724 rename ut clear force fail Fix #724 rename ut clear force fail Jan 11, 2021
@astrogeco astrogeco changed the title Fix #724 rename ut clear force fail Fix #724 and #722 rename ut clear force fail Jan 12, 2021
@astrogeco astrogeco changed the base branch from main to integration-candidate January 12, 2021 18:56
@astrogeco
Copy link
Contributor

@zanzaben please fix conflicts

@zanzaben zanzaben force-pushed the fix724_Rename_UT_ClearForceFail branch from 61e27ad to 29cdd51 Compare January 12, 2021 19:05
@zanzaben zanzaben changed the title Fix #724 and #722 rename ut clear force fail Fix #724, #722, rename ut clear force fail Jan 12, 2021
@zanzaben zanzaben force-pushed the fix724_Rename_UT_ClearForceFail branch from 29cdd51 to 0039e3e Compare January 13, 2021 13:52
@zanzaben zanzaben force-pushed the fix724_Rename_UT_ClearForceFail branch from 0039e3e to 35a1323 Compare January 13, 2021 14:54
@astrogeco
Copy link
Contributor

@zanzaben looks like some more conflicts came up :(

@zanzaben zanzaben force-pushed the fix724_Rename_UT_ClearForceFail branch from 35a1323 to e248041 Compare January 22, 2021 13:55
@astrogeco astrogeco merged commit 436e1ea into nasa:integration-candidate Jan 22, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Jan 22, 2021
@zanzaben zanzaben deleted the fix724_Rename_UT_ClearForceFail branch February 23, 2021 17:17
@skliper skliper added this to the 6.0.0 milestone Sep 24, 2021
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 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.

Change UT_ClearForceFail to UT_ClearDefaultReturnValue update UT_SetDefaultReturnValue comment
4 participants