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 #551, Remove duplicate CFE_TIME_Local1HzISR prototype #668

Merged

Conversation

skliper
Copy link
Contributor

@skliper skliper commented May 5, 2020

Describe the contribution
Removed duplicate prototype in cfe_time_utils.h
Fix #551

Testing performed
Standard make w/ unit tests

Expected behavior changes
None

System(s) tested on

  • Hardware: cFS Dev Server 3
  • OS: Ubuntu 18.04
  • Versions: Master bundle w/ this commit

Additional context
Bigger time service cleanup referenced in #302

Third party code
None

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

@skliper skliper added enhancement CCB:Ready Ready for discussion at the Configuration Control Board (CCB) labels May 5, 2020
@skliper skliper added this to the 6.8.0 milestone May 5, 2020
@astrogeco
Copy link
Contributor

CCB-20200506 - APPROVED

@astrogeco astrogeco added CCB-20200506 and removed CCB:Ready Ready for discussion at the Configuration Control Board (CCB) labels May 6, 2020
@astrogeco astrogeco changed the base branch from master to integration-candidate May 8, 2020 18:10
@astrogeco astrogeco added IC-20200429 CCB:Approved Indicates code review and approval by community CCB labels May 8, 2020
@astrogeco astrogeco merged commit 532c0dc into nasa:integration-candidate May 8, 2020
@skliper skliper deleted the fix551-dup-local1hzisr-proto branch February 1, 2021 22:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates code review and approval by community CCB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CFE_TIME_Local1HzISR duplicated define
2 participants