From a596f32384b6a227380b5ea1137ca6c8ecabd1b9 Mon Sep 17 00:00:00 2001
From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com>
Date: Tue, 4 May 2021 23:27:49 -0400
Subject: [PATCH] IC:2021-05-04, Combine cFE and osal

cfe v6.8.0-rc1+dev559 and osal v5.1.0-rc1+dev417

Combines:

nasa/osal#979
nasa/cFE#1481

Includes:

nasa/osal#973, UtPrintx function
nasa/osal#976, add socket shutdown implementation

nasa/cfe#1418, add ES CDS Functional test
nasa/cfe#1429, Function comment blocks
nasa/cfe#1414, Add Header Functional tests.
nasa/cfe#1415, add Current Time Functional Test
---
 cfe  | 2 +-
 osal | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cfe b/cfe
index c8b5e00bb..bb867604b 160000
--- a/cfe
+++ b/cfe
@@ -1 +1 @@
-Subproject commit c8b5e00bb722d8f59787ae8f82634feba5d39f60
+Subproject commit bb867604b35a3202c0866d8789367a26918cce26
diff --git a/osal b/osal
index a06166692..bf2f73da7 160000
--- a/osal
+++ b/osal
@@ -1 +1 @@
-Subproject commit a061666924644a7d23b17d3d060dc9e704913447
+Subproject commit bf2f73da71df8649a97f8b32a6eb23b22a836620