Merge pull request #743 from nasa/integration-candidate

Integration Candidate: 2020-06-10
nasa · Jun 17, 2020 · 1df042b · 1df042b
2 parents ad2190a + eefbfd0
commit 1df042b
Show file tree

Hide file tree

Showing 7 changed files with 668 additions and 1,929 deletions.
diff --git a/README.md b/README.md
@@ -8,6 +8,11 @@ This is a collection of services and associated framework to be located in the `
 
 ## Version History
 
+### Development Build: 6.7.20
+
+-  SB Unit use of the UT assert framework is closer to original design intent
+- See <https://github.com/nasa/cFE/pull/743>
+
 ### Development Build: 6.7.19
 
 - API Change: cFE ut_sb_stubs now has CFE_SB_DeletePipe available.

diff --git a/docs/cFE Application Developers Guide.md b/docs/cFE Application Developers Guide.md
@@ -451,7 +451,7 @@ Reference sample_app on Github for “live” example.
 | fsw/src/sample_app.h                  | Main header file for sample_app. It contains your main global typedef, prototypes, and miscellaneous define. |
 | fsw/src/sample_app_events.h           | Defines sample_app event IDs                                                                                 |
 | fsw/src/sample_app_msg.h              | Defines sample_app commands and its structures                                                               |
-| fsw/tables/sample_table.c             | Define sample_app table(s)                                                                                   |
+| fsw/tables/sample_app_table.c             | Define sample_app table(s)                                                                                   |
 | fsw/platform_inc/sample_app_msgids.h  | Define sample_app message IDs                                                                                |
 | fsw/mission_inc/sample_app_perfids.h  | Define sample_app performance IDs                                                                            |
 

diff --git a/fsw/cfe-core/src/inc/cfe_version.h b/fsw/cfe-core/src/inc/cfe_version.h
@@ -95,7 +95,7 @@
 */
 #define CFE_MAJOR_VERSION         6
 #define CFE_MINOR_VERSION         7
-#define CFE_REVISION              19
+#define CFE_REVISION              20
 
 
 #endif  /* _cfe_version_ */