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

Fix #922, Update cfe_error.h to use the CFE_Status_t type #935

Merged
merged 1 commit into from
Mar 1, 2021
Merged

Fix #922, Update cfe_error.h to use the CFE_Status_t type #935

merged 1 commit into from
Mar 1, 2021

Conversation

pducolin
Copy link
Contributor

@pducolin pducolin commented Oct 1, 2020 •
edited by skliper
Loading

Describe the contribution

Contributor Info - All information REQUIRED for consideration of pull request
Full name and company/organization/center of all contributors ("Personal" if individual work)

  • If NASA Civil Servant Employee or GSFC Contractor on SES II
    • Address/email/phone and contract/task information (if applicable) must be on file
  • Else if Company
    • HAND SIGNED Company CLA must be on file (once per release): Company CLA
  • Else if Individual
    • HAND SIGNED Individual CLA must be on file (once per release): Individual CLA

@skliper skliper added the CCB:PendingCLA External contribution pending CLA confirmation label Oct 2, 2020
zanzaben
zanzaben previously requested changes Oct 27, 2020
View reviewed changes
Copy link
Contributor

@zanzaben zanzaben left a comment

Choose a reason for hiding this comment

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

Resolve conflicts.

@astrogeco
Copy link
Contributor

Hi @pducolin thank you for your contribution! Could you sign and email the appropriate Contributor License agreement?

email it to: GSFC-SoftwareRelease@mail.nasa.gov and copy cfs-program@lists.nasa.gov

Thanks!

@astrogeco astrogeco added the community Community contribution, YAY! label Feb 2, 2021
@pducolin
Copy link
Contributor Author

Hi! Contributor agreement sent @astrogeco, thank you for adding the link.

@zanzaben conflicts fixed - I rebased on nasa:main.

Sorry for the delay!

@astrogeco astrogeco added the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label Feb 24, 2021
@astrogeco astrogeco dismissed zanzaben’s stale review February 24, 2021 04:14

rebased and fixed conflicts

@astrogeco astrogeco removed the CCB:PendingCLA External contribution pending CLA confirmation label Feb 24, 2021
@astrogeco
Copy link
Contributor

Hi! Contributor agreement sent @astrogeco, thank you for adding the link.

@zanzaben conflicts fixed - I rebased on nasa:main.

Sorry for the delay!

Received! Thank you for the contribution!

@astrogeco astrogeco changed the title Update cfe_error.h to use the CFE_Status_t type Fix #922, Update cfe_error.h to use the CFE_Status_t type Feb 24, 2021
@astrogeco
Copy link
Contributor

@pducolin one more request, can you amend the commit to match the title for this Pull Request?

@astrogeco astrogeco added CCB:2021-02-24 and removed CCB:Ready Ready for discussion at the Configuration Control Board (CCB) labels Feb 24, 2021
@astrogeco
Copy link
Contributor

CCB:2021-02-24 APPROVED

@astrogeco astrogeco changed the base branch from main to integration-candidate March 1, 2021 20:41
@astrogeco astrogeco merged commit 0ab0a48 into nasa:integration-candidate Mar 1, 2021
@astrogeco astrogeco mentioned this pull request Mar 1, 2021
Merged
astrogeco added a commit to nasa/cFS that referenced this pull request Mar 4, 2021
@astrogeco
cFS Bundle Integration Candidate: 2021-03-02
97cabe7 
Combines:

- nasa/cFE#1196
- nasa/osal#835
- nasa/elf2cfetbl#72

Includes:

- nasa/cFE#1154
- nasa/cFE#935
- nasa/cFE#1179
- nasa/cFE#1140
- nasa/cFE#1178
- nasa/cFE#1197

- nasa/osal#834
- nasa/osal#826
- nasa/osal#827
- nasa/osal#829
- nasa/osal#824

- nasa/elf2cfetbl#71
@astrogeco astrogeco mentioned this pull request Mar 4, 2021
Merged
@skliper skliper linked an issue Sep 24, 2021 that may be closed by this pull request
update cfe_error.h to use the CFE_Status_t type #922
Closed
@skliper skliper added this to the 7.0.0 milestone Sep 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zanzaben zanzaben zanzaben approved these changes

Assignees
No one assigned
Labels
community Community contribution, YAY!
Projects
None yet
Milestone
Caelum
Development

Successfully merging this pull request may close these issues.

update cfe_error.h to use the CFE_Status_t type
4 participants
@pducolin @astrogeco @zanzaben @skliper