Skip to content

Commit

Permalink
Merge pull request #287 from nasa/integration-candidate
Browse files Browse the repository at this point in the history 
Integration Candidate: 2021-06-29
  • Loading branch information
@astrogeco
astrogeco authored Jul 7, 2021
2 parents 5d80736 + dc6fde3 commit 985d3ac
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cfe
Submodule cfe updated 11 files
+7 −0 README.md
+13 −2 modules/cfe_testcase/src/cfe_test.h
+1 −1 modules/cfe_testcase/src/es_cds_test.c
+6 −6 modules/cfe_testcase/src/es_info_test.c
+2 −2 modules/cfe_testcase/src/es_task_test.c
+19 −6 modules/cfe_testcase/src/fs_header_test.c
+1 −1 modules/core_api/fsw/inc/cfe_version.h
+1 −1 modules/core_private/ut-stubs/src/ut_support.c
+0 −17 modules/es/fsw/src/cfe_es_log.h
+0 −17 modules/es/fsw/src/cfe_es_syslog.c
+58 −2 modules/es/ut-coverage/es_UT.c
2 changes: 1 addition & 1 deletion osal
Submodule osal updated 12 files
+12 −0 README.md
+2 −2 docs/src/osalmain.dox
+2 −2 src/bsp/generic-vxworks/src/bsp_start.c
+1 −1 src/os/inc/osapi-network.h
+1 −1 src/os/inc/osapi-sockets.h
+1 −1 src/os/inc/osapi-version.h
+10 −1 src/os/rtems/src/os-impl-tasks.c
+26 −17 src/os/vxworks/src/os-impl-timebase.c
+1 −1 src/tests/network-api-test/network-api-test.c
+20 −9 src/unit-test-coverage/vxworks/src/coveragetest-timebase.c
+11 −5 src/unit-tests/oscore-test/ut_oscore_task_test.c
+10 −2 src/unit-tests/osloader-test/ut_osloader_symtable_test.c

0 comments on commit 985d3ac

Please sign in to comment.