Integration Candidate 2020-04-01

[astrogeco]

Describe the contribution
Integration Candidate
Integrates:

1. cFE 6.7.12 - Integration Candidate - 2020-04-01 cFE#586
2. osal 5.0.11 - Integration Candidate 2020-04-01 osal#408
3. psp 1.4.8 - Integration Candidate 2020-04-01 PSP#151
4. cFS-GroundSystem 2.1.6 - Integration Candidate 2020-04-01 cFS-GroundSystem#69

Testing performed
Bundle CI - https://travis-ci.com/github/nasa/cFS/builds/159710339

Expected behavior changes
See PRs

System(s) tested on
Bundle CI - Ubuntu:Bionic

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

[astrogeco]

@skliper I think the deprecated OS_IntLock and OS_IntUnlock are causing trouble in cfe_es_perf.c 's CFE_ES_PerfLogAdd:437

[skliper]

See the comment on nasa/osal#396

This won't compile with deprecated removed until nasa/cFE#456 gets resolved

[astrogeco]

@skliper I made two commits in my cFE fork that I think fix this but I worry that it might break something else:

astrogeco/cFE@8da0e47
astrogeco/cFE@bb2a401

[jphickey]

Note that the pull request for nasa/cFE#456 is now submitted in nasa/cFE#595, and this will cause a merge conflict with the #ifdef blocks where currently it is a clean merge.

Should be an easy rebase though, so if you do put this in let me know so I can rebase the pull request.

[astrogeco]

Note that the pull request for nasa/cFE#456 is now submitted in nasa/cFE#595, and this will cause a merge conflict with the #ifdef blocks where currently it is a clean merge.

Should be an easy rebase though, so if you do put this in let me know so I can rebase the pull request.

I think a better option is to fast-track nasa/cFE#595 and merge that instead @skliper thoughts?

[skliper]

I'm all for moving nasa/cFE#595 forward. I already approved.

[jphickey]

I've got another pull request that I'm just about to submit for 295/480 which depends on 595, so if you decide to include nasa/cFE#595, then let me know as soon as the integration candidate is ready so I can rebase to it.

[astrogeco]

I've got another pull request that I'm just about to submit for 295/480 which depends on 595, so if you decide to include nasa/cFE#595, then let me know as soon as the integration candidate is ready so I can rebase to it.

@jphickey, I just merged the IC.