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

Integration Candidate 2020-03-18 #375

Merged
merged 6 commits into from
Mar 27, 2020
Merged

Integration Candidate 2020-03-18 #375

merged 6 commits into from
Mar 27, 2020

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Mar 23, 2020

Describe the contribution
Fix #10, #70, #116, #225, and #364

Testing performed
See PRs

Expected behavior changes
See related PR

System(s) tested on
Bundle CI Ubuntu:Bionic - see nasa/cFS#58

Additional context
See PR #371

Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman, NASA-GSFC
Gerardo E. Cruz-Ortiz, NASA-GSFC

skliper and others added 5 commits March 15, 2020 16:59
Document/comment changes only
Partially addresses #255, #12, #18, #366
Replicated changes to old documents that were
done previously.  Document/comment change only.
@astrogeco astrogeco changed the title Integration Candidate 20200318 Integration Candidate 2020-03-18 Mar 24, 2020
@astrogeco astrogeco merged commit 20a83c4 into master Mar 27, 2020
@skliper skliper added this to the 5.1.0 milestone Jun 1, 2020
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 2022
Fixes nasa#361, nasa#373, nasa#374, nasa#381
Code reviewed and approved at 20191023 and 30 CCBs
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.

Update OS_TimerSet API documentation for timer disable
2 participants