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.

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

Integration Candidate: 2020-06-17 #106

Merged
merged 3 commits into from
Jun 25, 2020
Merged

Integration Candidate: 2020-06-17 #106

merged 3 commits into from
Jun 25, 2020

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Jun 23, 2020

Describe the contribution
Combines
nasa/cFE#756
nasa/osal#521
nasa/cFS-GroundSystem#107

Also,
Fix #63

Testing performed
Bundle CI - https://github.com/nasa/cFS/pull/106/checks

Expected behavior changes
PR #99 - Added the references (links) to the cFE and OSAL user guides from the gh-pages branch.
PR #103 - Update PyQt reference in docs

See submodules PRs for more details

System(s) tested on
Ubuntu:Bionic

Additional context
None

Code contibutions
N/A

Contributor Info - All information REQUIRED for consideration of pull request
Jandlyn Bentley, NASA-GSFC
Evan Fitzgerald, Canadian Space Agency [docs only]
Gerardo E. Cruz-Ortiz, NASA-GSFC

… from the… (#99)

* Added the references (links) to the cFE and OSAL user guides from the gh-pages branch.

* Moved the references to the top of the document before release notes.
@astrogeco astrogeco marked this pull request as ready for review June 25, 2020 12:49
@astrogeco astrogeco merged commit bc9c0f3 into master Jun 25, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Reference autogenerated docs
3 participants