Merge pull request #810 from nasa/integration-candidate

IC: equuleus-rc1+dev21
nasa · Dec 10, 2024 · 47c70f6 · 47c70f6
2 parents 6376290 + 2be142b
commit 47c70f6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/cfe b/cfe
diff --git a/osal b/osal
diff --git a/psp b/psp
diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem
+7 −0		CHANGELOG.md
+1 −1		modules/cfe_assert/src/cfe_assert_runner.c
+6 −5		modules/core_api/fsw/inc/cfe_evs.h
+1 −1		modules/core_api/fsw/inc/cfe_version.h
+8 −6		modules/core_api/ut-stubs/src/cfe_evs_stubs.c
+35 −45		modules/es/fsw/src/cfe_es_apps.c
+2 −2		modules/evs/config/default_cfe_evs_msgdefs.h
+5 −3		modules/evs/fsw/src/cfe_evs.c
+5 −10		modules/evs/fsw/src/cfe_evs_log.c
+3 −3		modules/evs/fsw/src/cfe_evs_utils.c
+3 −3		modules/evs/fsw/src/cfe_evs_utils.h
+4 −0		CHANGELOG.md
+1 −1		src/os/inc/osapi-version.h
+10 −0		src/os/shared/src/osapi-filesys.c
+5 −0		src/unit-test-coverage/shared/src/coveragetest-filesys.c
+1 −0		src/unit-test-coverage/ut-stubs/inc/OCS_string.h
+1 −0		src/unit-test-coverage/ut-stubs/override_inc/string.h
+19 −0		src/unit-test-coverage/ut-stubs/src/libc-string-stubs.c
+6 −0		CHANGELOG.md
+1 −1		Subsystems/cmdGui/ParameterFiles/struct_c_f_e___e_v_s___log__t
+3 −3		Subsystems/tlmGUI/cfe-es-app-tlm.txt
+10 −6		Subsystems/tlmGUI/cfe-es-hk-tlm.txt
+4 −3		Subsystems/tlmGUI/cfe-sb-hk-tlm.txt
+3 −3		Subsystems/tlmGUI/cfe-tbl-reg-tlm.txt
+9 −9		Subsystems/tlmGUI/cfs-ful-hk-tlm.txt
+6 −6		Subsystems/tlmGUI/cfs-nav-hk-tlm.txt
+1 −1		_version.py