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.

Sign up for GitHub

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

Jump to bottom

cFS Bundle Integration candidate: 2021-05-04 #252

Merged
merged 3 commits into from
May 5, 2021
Merged

cFS Bundle Integration candidate: 2021-05-04 #252

merged 3 commits into from
May 5, 2021

Commits on Apr 29, 2021

  1. Fix #240, Add Instruction on How To Use Workflows in Contributing.md

    @arielswalker
    arielswalker committed Apr 29, 2021
    Configuration menu
    Copy the full SHA
    a8dca28 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2021

  1. IC:2021-05-04, Combine cFE and osal 

    cfe v6.8.0-rc1+dev559 and osal v5.1.0-rc1+dev417

Combines:

nasa/osal#979
nasa/cFE#1481

Includes:

nasa/osal#973, UtPrintx function
nasa/osal#976, add socket shutdown implementation

nasa/cFE#1418, add ES CDS Functional test
nasa/cFE#1429, Function comment blocks
nasa/cFE#1414, Add Header Functional tests.
nasa/cFE#1415, add Current Time Functional Test
    @astrogeco
    astrogeco committed May 5, 2021
    Configuration menu
    Copy the full SHA
    a596f32 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #241 from ArielSAdamsNASA/fix-240-instructions-how… 

    …-to-use-workflows

Fix #240,  Add Instruction on How To Use Workflows in Contributing.md
    @astrogeco
    astrogeco authored May 5, 2021
    Configuration menu
    Copy the full SHA
    be3ae5b View commit details
    Browse the repository at this point in the history