Skip to content

Commit

Permalink
Merge pull request nasa#260 from nasa/integration-candidate
Browse files Browse the repository at this point in the history 
cFS Bundle Integration Candidate:2021-05-25


Co-authored-by: Joseph Hickey <[email protected]>
Co-authored-by: Jake Hageman skliper <[email protected]>
Co-authored-by: Zachary Gonzalez <[email protected]>
Co-authored-by: Alex Campbell <[email protected]>
  • Loading branch information
@astrogeco @jphickey
@skliper @zachar1a @zanzaben
5 people committed May 26, 2021
2 parents 5c06963 + 365e7d7 commit 15733f2
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 35 files
+11 −0 README.md
+93 −72 cmake/arch_build.cmake
+1 −0 cmake/generate_table.cmake
+2 −1 modules/cfe_testcase/src/es_task_test.c
+1 −1 modules/cfe_testcase/src/time_current_test.c
+18 −18 modules/core_api/fsw/inc/cfe_es.h
+3 −5 modules/core_api/fsw/inc/cfe_evs.h
+2 −2 modules/core_api/fsw/inc/cfe_msg.h
+5 −5 modules/core_api/fsw/inc/cfe_resourceid.h
+2 −2 modules/core_api/fsw/inc/cfe_sb.h
+2 −5 modules/core_api/fsw/inc/cfe_tbl.h
+1 −1 modules/core_api/fsw/inc/cfe_version.h
+14 −14 modules/core_api/ut-stubs/src/cfe_es_stubs.c
+2 −2 modules/core_api/ut-stubs/src/cfe_evs_stubs.c
+2 −2 modules/core_api/ut-stubs/src/cfe_msg_stubs.c
+2 −2 modules/core_api/ut-stubs/src/cfe_sb_stubs.c
+0 −229 modules/core_api/ut-stubs/src/ut_time_handlers.c
+31 −31 modules/es/fsw/src/cfe_es_api.c
+2 −1 modules/es/fsw/src/cfe_es_apps.c
+6 −6 modules/es/fsw/src/cfe_es_mempool.c
+17 −0 modules/es/ut-coverage/es_UT.c
+7 −7 modules/evs/fsw/src/cfe_evs.c
+4 −4 modules/fs/fsw/src/cfe_fs_api.c
+12 −12 modules/msg/fsw/src/cfe_msg_ccsdsext.c
+17 −17 modules/msg/fsw/src/cfe_msg_ccsdspri.c
+1 −1 modules/msg/fsw/src/cfe_msg_init.c
+1 −1 modules/msg/fsw/src/cfe_msg_msgid_shared.c
+2 −2 modules/msg/fsw/src/cfe_msg_msgid_v1.c
+2 −2 modules/msg/fsw/src/cfe_msg_msgid_v2.c
+4 −4 modules/msg/fsw/src/cfe_msg_sechdr_checksum.c
+4 −4 modules/msg/fsw/src/cfe_msg_sechdr_fc.c
+4 −4 modules/msg/fsw/src/cfe_msg_sechdr_time.c
+14 −14 modules/sb/fsw/src/cfe_sb_api.c
+20 −20 modules/tbl/fsw/src/cfe_tbl_api.c
+2 −2 modules/time/fsw/src/cfe_time_api.c
2 changes: 1 addition & 1 deletion osal
Submodule osal updated 7 files
+7 −0 README.md
+14 −0 src/bsp/generic-linux/src/bsp_start.c
+1 −0 src/bsp/generic-linux/src/generic_linux_bsp_internal.h
+1 −1 src/os/inc/osapi-version.h
+1 −9 src/os/shared/src/osapi-task.c
+285 −0 src/tests/count-sem-timeout-test/count-sem-timeout-test.c
+0 −4 src/unit-test-coverage/shared/src/coveragetest-task.c

0 comments on commit 15733f2

Please sign in to comment.