From 43cbd3fbf1142cf3b0400f0a17c08c9e054770f9 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Mon, 10 May 2021 21:43:28 -0400 Subject: [PATCH] IC:2021-05-11, Combine cfe and osal nasa/cFE#1492, cFE v6.8.0-rc1+dev575 nasa/osal#996, osal v5.1.0-rc1+dev434 nasa/cfe#1487, Remove broken travis-ci script nasa/cfe#1463, generated coverage stubs for CFE core nasa/cfe#1463, Move CFE_FS_RunBackgroundFileDump to internal API nasa/cfe#1451, OSAL config file simplification nasa/cfe#1489, removes --quiet option so files checked go to stdout nasa/osal#978, configuration guide updates nasa/osal#974, improve documentation of UtAssert API calls nasa/osal#977, update OS_TaskCreate doc nasa/osal#997, Enable cppcheck results output nasa/osal#980, Scrub return values nasa/osal#992, add local mutex to BSP console nasa/osal#993, do not require nonblock mode Co-authored-by: Jacob Hageman Co-authored-by: Joseph Hickey --- cfe | 2 +- osal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cfe b/cfe index 82c1bd4d1..84ba9a997 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit 82c1bd4d1c8937deff801cfebf2698866228ea6a +Subproject commit 84ba9a9974794e239b989cdc4e2359216e44fab0 diff --git a/osal b/osal index 706f0de69..9756b0396 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 706f0de6902eb442563b44ae58904100a0e72cd3 +Subproject commit 9756b0396807a7dcd64230f01f38e4cad5f3d4f7