From 9ca697a499d6fff46e05a8263d9c954863af8f90 Mon Sep 17 00:00:00 2001
From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com>
Date: Sun, 11 Apr 2021 12:51:44 -0400
Subject: [PATCH] cFS Bundle IC:2021-04-13

Combines

nasa/osal#956
nasa/cFE#1295

Including:

nasa/osal#941 - Allow OSAL re-initialization
nasa/osal#941 - Combine initialized and shutdown flags into one
nasa/osal#948 - Add OS_API_Teardown
nasa/osal#948 - Black Box Unit Tests Do Not Ensure Resources Are Cleaned Up Between Tests
nasa/osal#940 - Rework shell test

nasa/cfe#1276 - Use events for CFE test asserts
---
 cfe  | 2 +-
 osal | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cfe b/cfe
index eaa343c2e..e80aae94e 160000
--- a/cfe
+++ b/cfe
@@ -1 +1 @@
-Subproject commit eaa343c2e5d457f7d04b65ada8881b24e4fb46bc
+Subproject commit e80aae94e0f56b868657daba965c590766a4dc57
diff --git a/osal b/osal
index ba0ac40d3..b37da18bd 160000
--- a/osal
+++ b/osal
@@ -1 +1 @@
-Subproject commit ba0ac40d3b58b4d12f32a2222c8c8ed2fb663c65
+Subproject commit b37da18bd5efed6d86344e4cafaa42c833b015fb