Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix #625, Apply standard formatting #626

Merged

Conversation

skliper
Copy link
Contributor

@skliper skliper commented Oct 21, 2020

Describe the contribution
Fix #625 - apply standard formatting

Testing performed
Build/run unit tests, all pass.

Expected behavior changes
None, whitespace only

System(s) tested on

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

Additional context
None

Third party code
None

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

@skliper skliper marked this pull request as draft October 21, 2020 14:20
@skliper skliper marked this pull request as ready for review October 21, 2020 15:39
@skliper skliper added this to the 6.0.0 milestone Oct 21, 2020
@skliper skliper added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Oct 21, 2020
@skliper
Copy link
Contributor Author

skliper commented Oct 21, 2020

Scanned updates, net improvement (fixed some indent inconsistencies, removed extra lines, etc). Nothing sufficiently mangled to require hand edit.

@astrogeco
Copy link
Contributor

CCB 2020-10-21 APPROVED

@skliper
Copy link
Contributor Author

skliper commented Oct 21, 2020

@astrogeco could this go in the current IC? Would minimize impact and allow for me to progress with the other cleanup changes.

@astrogeco
Copy link
Contributor

@astrogeco could this go in the current IC? Would minimize impact and allow for me to progress with the other cleanup changes.

Might as well since I haven't merged it yet.

@astrogeco astrogeco changed the base branch from main to integration-candidate October 21, 2020 17:54
@astrogeco astrogeco merged commit 92dc273 into nasa:integration-candidate Oct 21, 2020
astrogeco added a commit to nasa/cFS that referenced this pull request Oct 21, 2020
@astrogeco astrogeco removed the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Oct 21, 2020
astrogeco added a commit to nasa/cFS that referenced this pull request Oct 21, 2020
* Add nasa/PSP#207

* Add nasa/cFE#946

* Update CFE to fix startup issue

* Add nasa/osal#626

Co-authored-by: Joseph Hickey <joseph.p.hickey@nasa.gov>
@skliper skliper deleted the fix625-standard-formatting branch February 1, 2021 21:36
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Apply standard formatting
3 participants