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

Integration Candidate: 2020-04-22 #649

Merged
merged 16 commits into from
May 1, 2020
Merged

Integration Candidate: 2020-04-22 #649

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1b03958
Fix #591, Avoid deadlock in CFE_ES_CreatObjects
skliper Apr 15, 2020
2bcdf50
Fixes 121, adds check for UsedFlag and sets APID to CFE_TBL_NOT_OWNED…
dmknutsen Apr 16, 2020
95a3a98
Fix #410, separate SYSLOG configurable defaults for power on and proc…
dmknutsen Apr 20, 2020
72dcd3a
fix #503 - CFE_TBL_Load() events
CDKnightNASA Apr 21, 2020
2890418
Merge pull request #625 from dmknutsen/issue_410
astrogeco Apr 28, 2020
7566f2f
Merge pull request #619 from skliper/fix591-writetosys-deadlock
astrogeco Apr 28, 2020
a4d087e
Merge pull request #606 from CDKnightNASA/fix-503-tbl_events
astrogeco Apr 28, 2020
53cfc1e
Merge pull request #622 from dmknutsen/issue_121
astrogeco Apr 28, 2020
6ef8a02
Fix #623, Replace OS_FS_* return codes with common definitions (#624)
dmknutsen Apr 29, 2020
dc10f47
IC HOTFIX: Use lowercase "true"
astrogeco Apr 29, 2020
0818824
HOTFIX - CFE_TBL_Load() and ThisAppId
CDKnightNASA Apr 30, 2020
dba6e6e
HOTFIX - CFE_TBL_Load()
CDKnightNASA Apr 30, 2020
95538de
HOTFIX - (int) for printf
CDKnightNASA Apr 30, 2020
5715760
HOTFIX - Quote mismatch in comments causing doxygen warning
skliper May 1, 2020
1660843
Add link to issue for TBL EID TODOs
astrogeco May 1, 2020
4de29bd
Increase version to 6.7.15 and update README
astrogeco May 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
HOTFIX - Quote mismatch in comments causing doxygen warning
  • Loading branch information
@skliper
skliper committed May 1, 2020
commit 5715760c4750afe0f2c64bf089c210f4fa2f37d5
4 changes: 2 additions & 2 deletions fsw/cfe-core/src/inc/cfe_tbl_events.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,8 +970,8 @@
**/
#define CFE_TBL_UPDATE_ERR_EID 95

/** \brief <tt> '\%s validation failed for Inactive '\%s', Status=0x\%08X" </tt>
** \event <tt> '\%s validation failed for Inactive '\%s', Status=0x\%08X" </tt>
/** \brief <tt> '\%s validation failed for Inactive '\%s', Status=0x\%08X' </tt>
** \event <tt> '\%s validation failed for Inactive '\%s', Status=0x\%08X' </tt>
**
** \par Type: ERROR
**
Expand Down