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.

Sign up for GitHub

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

Jump to bottom

Integration Candidate 20200108 #31

Merged
merged 4 commits into from
Jan 17, 2020
Merged

Integration Candidate 20200108 #31

merged 4 commits into from
Jan 17, 2020

Conversation

skliper
Copy link
Contributor

@skliper skliper commented Jan 15, 2020

Describe the contribution
Merge #28, #30
Fix #24, fix #29

Testing performed

  1. Checked out IC bundle
  2. Built and ran cFS unit tests and OSAL coverage (vxworks and shared)
    1. All passed
  3. make osalguide to confirm it built
  4. Ran core-cpu1 (cFS), no errors/warnings/failures observed

Expected behavior changes
None - code style and enforcement

System(s) tested on

  • cFS Dev Server 2
  • OS: Ubuntu 18.04
  • Versions: IC branches

Additional context
N/A

Third party code
N/A

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

@skliper skliper added this to the 2.4.0 milestone Jan 15, 2020
@skliper
Copy link
Contributor Author

skliper commented Jan 17, 2020

CCB 20200115 - Reviewed and approved for merge to master

@skliper skliper merged commit 21f8383 into master Jan 17, 2020
@skliper skliper added the CCB:Approved Indicates code approval by CCB label Jan 17, 2020
@skliper skliper deleted the ic-20200108 branch January 17, 2020 20:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
CCB:Approved Indicates code approval by CCB
Projects
None yet
Milestone
Bootes
Development

Successfully merging this pull request may close these issues.

Apply standard coding style Enforce standard coding style in CI
1 participant
@skliper