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

Release candidate 6.7 merge to master #30

Merged
merged 4 commits into from
Sep 16, 2019
Merged

Release candidate 6.7 merge to master #30

merged 4 commits into from
Sep 16, 2019

Conversation

skliper
Copy link
Contributor

@skliper skliper commented Sep 16, 2019 •
edited
Loading

Describe the contribution
Bulk merge to 6.7, plus bug fix #22 and version update

Testing performed
Steps taken to test the contribution:

  1. Checked out cFS rc-6.7.0, updated to latest cFE/OSAL/PSP rc branches and setup/built via standard instructions
  2. Ran cFE and observed version update
EVS Port1 42/1/CFE_ES 2: Versions:cFE 6.7.0.0, OSAL 5.0.0.0, PSP 1.4.0.0, chksm 47578

Expected behavior changes
Minor behavior changes will be documented in the VDD upon release (no major/requirements updates)

System(s) tested on:

  • cFS development server
  • Ubuntu 16.04.6, 4.4.0-146-generic, x64
  • 6.7.0 bundle

Additional context
None

Contributor Info
Jacob Hageman/NASA-GSFC

Community contributors
CLA on file

skliper and others added 4 commits September 6, 2019 16:55
@skliper
Bulk Merge of rc-6.7.0
6aaf5a3
@jphickey
Fix #22: calls to strlen are incorrect
7948323 
Fix incorrect call to strlen in CFE_ES_TaskInit function.
@skliper
FASTTRACK: Merge #22
e998697 
Fixes string length bug
@skliper
Update version number
8de4f1b
@skliper skliper requested a review from jphickey September 16, 2019 15:52
@skliper skliper added this to the 6.7.0 milestone Sep 16, 2019
jphickey
jphickey approved these changes Sep 16, 2019
View reviewed changes
Copy link
Contributor

@jphickey jphickey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed changes correlate to description. Builds and runs OK for me, as expected.

Event generated:
EVS Port1 42/1/CFE_ES 2: Versions:cFE 6.7.0.0, OSAL 5.0.0.0, PSP 1.4.0.0, chksm 44213

@skliper skliper merged commit 8de4f1b into master Sep 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jphickey jphickey

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Aquila
Development

Successfully merging this pull request may close these issues.

Incorrect calls to strlen in CFE_ES_TaskInit
2 participants
@skliper @jphickey