Fix #1070 for main branch (merge of 6.8.x after bookkeeping)#1139
Merged
astrogeco merged 2 commits intointegration-candidatefrom Feb 3, 2021
Merged
Fix #1070 for main branch (merge of 6.8.x after bookkeeping)#1139astrogeco merged 2 commits intointegration-candidatefrom
astrogeco merged 2 commits intointegration-candidatefrom
Conversation
The PSP header files are located in fsw/shared/inc, not fsw/shared. This corrects the reference.
Fix #1070, patch PSP include directory reference
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Describe the contribution
This just applies Fix #1070 to main
Testing performed
Leveraging testing from #1072
Expected behavior changes
PSP module include path correct (should build)
System(s) tested on
No new testing, just a merge
Additional context
None
Third party code
None
Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman - NASA/GSFC