Skip to content

Commit

Permalink
Merge pull request #139 from nasa/integration-candidate
Browse files Browse the repository at this point in the history
Integration Candidate: 2020-09-09

Integration candidate includes:
nasa/cFE#876
nasa/osal#596
nasa/cFS-GroundSystem#135
  • Loading branch information
yammajamma committed Sep 15, 2020
2 parents 78e6ca6 + c5ec036 commit d3b5fad
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cfe
Submodule cfe updated 55 files
+11 −0 README.md
+121 −33 fsw/cfe-core/src/es/cfe_es_api.c
+24 −22 fsw/cfe-core/src/es/cfe_es_apps.c
+1 −1 fsw/cfe-core/src/es/cfe_es_apps.h
+1 −1 fsw/cfe-core/src/es/cfe_es_backgroundtask.c
+1 −1 fsw/cfe-core/src/es/cfe_es_cds.h
+1 −1 fsw/cfe-core/src/es/cfe_es_cds_mempool.h
+20 −19 fsw/cfe-core/src/es/cfe_es_erlog.c
+140 −3 fsw/cfe-core/src/es/cfe_es_global.h
+23 −15 fsw/cfe-core/src/es/cfe_es_perf.c
+1 −1 fsw/cfe-core/src/es/cfe_es_perf.h
+6 −3 fsw/cfe-core/src/es/cfe_es_start.c
+6 −4 fsw/cfe-core/src/es/cfe_es_syslog.c
+22 −16 fsw/cfe-core/src/es/cfe_es_task.c
+1 −1 fsw/cfe-core/src/es/cfe_esmempool.h
+6 −5 fsw/cfe-core/src/evs/cfe_evs_log.c
+6 −6 fsw/cfe-core/src/evs/cfe_evs_task.c
+1 −1 fsw/cfe-core/src/evs/cfe_evs_task.h
+3 −3 fsw/cfe-core/src/fs/cfe_fs_api.c
+1 −1 fsw/cfe-core/src/fs/cfe_fs_priv.h
+2 −2 fsw/cfe-core/src/inc/ccsds_hdr.h
+1 −1 fsw/cfe-core/src/inc/cfe_error.h
+7 −7 fsw/cfe-core/src/inc/cfe_es.h
+35 −35 fsw/cfe-core/src/inc/cfe_es_msg.h
+2 −2 fsw/cfe-core/src/inc/cfe_evs.h
+27 −27 fsw/cfe-core/src/inc/cfe_evs_msg.h
+3 −3 fsw/cfe-core/src/inc/cfe_fs.h
+1 −1 fsw/cfe-core/src/inc/cfe_fs_extern_typedefs.h
+4 −4 fsw/cfe-core/src/inc/cfe_msg_typedefs.h
+2 −2 fsw/cfe-core/src/inc/cfe_sb.h
+16 −16 fsw/cfe-core/src/inc/cfe_sb_msg.h
+2 −2 fsw/cfe-core/src/inc/cfe_tbl.h
+1 −1 fsw/cfe-core/src/inc/cfe_tbl_extern_typedefs.h
+2 −2 fsw/cfe-core/src/inc/cfe_tbl_filedef.h
+23 −23 fsw/cfe-core/src/inc/cfe_tbl_msg.h
+3 −3 fsw/cfe-core/src/inc/cfe_time.h
+22 −22 fsw/cfe-core/src/inc/cfe_time_msg.h
+1 −1 fsw/cfe-core/src/inc/cfe_version.h
+30 −29 fsw/cfe-core/src/sb/cfe_sb_api.c
+3 −3 fsw/cfe-core/src/sb/cfe_sb_priv.h
+45 −39 fsw/cfe-core/src/sb/cfe_sb_task.c
+7 −5 fsw/cfe-core/src/tbl/cfe_tbl_internal.c
+1 −1 fsw/cfe-core/src/tbl/cfe_tbl_internal.h
+2 −2 fsw/cfe-core/src/tbl/cfe_tbl_task.h
+29 −21 fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.c
+2 −2 fsw/cfe-core/src/time/cfe_time_task.c
+1 −1 fsw/cfe-core/src/time/cfe_time_tone.c
+3 −3 fsw/cfe-core/src/time/cfe_time_utils.h
+17 −29 fsw/cfe-core/unit-test/es_UT.c
+3 −3 fsw/cfe-core/unit-test/fs_UT.c
+8 −2 fsw/cfe-core/unit-test/sb_UT.c
+2 −1 fsw/cfe-core/unit-test/tbl_UT.c
+1 −1 fsw/cfe-core/unit-test/time_UT.c
+7 −0 fsw/cfe-core/ut-stubs/ut_evs_stubs.c
+3 −3 fsw/cfe-core/ut-stubs/ut_fs_stubs.c
2 changes: 1 addition & 1 deletion tools/cFS-GroundSystem

0 comments on commit d3b5fad

Please sign in to comment.