Merge pull request #140 from nasa/integration-candidate

Integration Candidate: 2020-09-16 Includes: nasa/cFE#891 nasa/osal#600 nasa/PSP#196 nasa/sample_lib#32 nasa/sample_app#98
nasa · Sep 22, 2020 · 068cd8c · 068cd8c
2 parents d3b5fad + 873773e
commit 068cd8c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/apps/sample_app b/apps/sample_app
diff --git a/apps/sample_lib b/apps/sample_lib
diff --git a/cfe b/cfe
diff --git a/osal b/osal
diff --git a/psp b/psp
+7 −0		README.md
+1 −1		fsw/src/sample_app_version.h
+3 −1		unit-test/CMakeLists.txt
+30 −21		unit-test/coveragetest/coveragetest_sample_app.c
+5 −0		README.md
+2 −2		fsw/src/sample_lib_version.h
+3 −1		unit-test/CMakeLists.txt
+8 −0		README.md
+4 −4		cmake/sample_defs/targets.cmake
+40 −38		docs/src/cfs_versions.dox
+37 −0		fsw/cfe-core/src/es/cfe_es_api.c
+20 −13		fsw/cfe-core/src/es/cfe_es_apps.c
+90 −0		fsw/cfe-core/src/es/cfe_es_global.h
+24 −0		fsw/cfe-core/src/inc/cfe_es.h
+2 −3		fsw/cfe-core/src/inc/cfe_version.h
+2 −2		fsw/cfe-core/unit-test/CMakeLists.txt
+130 −118		fsw/cfe-core/unit-test/es_UT.c
+1 −0		fsw/cfe-core/unit-test/es_UT.h
+3 −1		modules/msg/unit-test-coverage/CMakeLists.txt
+6 −0		README.md
+2 −2		fsw/mcp750-vxworks/inc/psp_version.h
+2 −2		fsw/pc-linux/inc/psp_version.h
+1 −1		fsw/pc-rtems/inc/psp_version.h
+1 −1		unit-test-coverage/mcp750-vxworks/CMakeLists.txt
+1 −1		ut-stubs/ut_psp_stubs.c