Fix #59, Update cmd and tlm definitions to match code#60
Merged
astrogeco merged 2 commits intonasa:integration-candidatefrom Apr 21, 2020
Merged
Fix #59, Update cmd and tlm definitions to match code#60astrogeco merged 2 commits intonasa:integration-candidatefrom
astrogeco merged 2 commits intonasa:integration-candidatefrom
Conversation
skliper
changed the title
Contributor
|
This doesn't look right... 2 #50 commits? I suggest cleanup. Basically from #56 the two commits should be squashed. Then rebase the #59 commit on the squashed commit from #56. The review of for this pull request should focus on the #59 changes, not the #50 changes. The #50 changes are the focus of #56 and should be reviewed as part of that pull request. I'd prefer to avoid trying to "combine" the review of these separate items under this pull request to avoid mixing comments/concerns/approvals/etc. |
Contributor
|
Does this also fix #31? If so could you mark that as fixed with this pull request? |
dmknutsen
force-pushed
the
issue_59
branch
4 times, most recently
from
5ae236a to
ad39429
Compare
Integration Candidate 2020-03-18
Contributor
|
Should be rebased on the current master, and b290a52 should go away... |
skliper
added
the
CCB:Ready
Contributor
|
CCB 20200415 - APPROVED |
astrogeco
added
CCB:Approved
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
Fixes #59, Fixes #31
Updates all cmd and tlm definitions to match code, just the last commit applies (the only one that should remain after rebasing on latest master)
Testing performed
Reviewed telemetry to ensure it is being decommed correctly.
Spot checked commands.
Expected behavior changes
Commands/Telemetry should now be defined correctly.
System(s) tested on
Oracle VM VirtualBox
OS: ubuntu-19.10
Versions: cFE 6.7.6.0, OSAL 5.0.6.0, PSP 1.4.4.0
Contributor Info - All information REQUIRED for consideration of pull request
Dan Knutsen
NASA/Goddard
*EDIT - fixed key words for issue linkage and simplified review message