From 99e2ab0aabd69f7084926cac47a2bdc84c60e65b Mon Sep 17 00:00:00 2001
From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com>
Date: Mon, 12 Jul 2021 19:49:39 -0400
Subject: [PATCH] IC:2021-07-13

**Combines:**

nasa/cFE#1661, v6.8.0-rc1+dev746
nasa/osal#1100, v5.1.0-rc1+dev569

*Includes:*

nasa/osal#1089, timer reconfig tests

nasa/cfe#1656, Size unit test table load buffer based on config
nasa/cfe#1657, Add SB Pipe Management Functional Tests
---
 cfe  | 2 +-
 osal | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cfe b/cfe
index 063b4d8a9..2afdbc16e 160000
--- a/cfe
+++ b/cfe
@@ -1 +1 @@
-Subproject commit 063b4d8a9c4a7e822af5f3e4017599159b985bb0
+Subproject commit 2afdbc16e360530a9b4bbe4e0dcc814f675c1acb
diff --git a/osal b/osal
index 5e8f40b00..cb95655f1 160000
--- a/osal
+++ b/osal
@@ -1 +1 @@
-Subproject commit 5e8f40b003896c8a60bebc2249d7cb61c33c22de
+Subproject commit cb95655f1743890835a10847439380b5ef7e31a0