From 755577338b9f0738e04f366a2270df7ea93fbd0a Mon Sep 17 00:00:00 2001
From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com>
Date: Wed, 28 Jul 2021 12:20:06 -0400
Subject: [PATCH 1/2] Fix #247, Move sample_libs into libraries dir

Set default branch for submodules in .gitmodules to "main"
---
 .gitmodules               | 20 ++++++++++----------
 {apps => libs}/sample_lib |  0
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename {apps => libs}/sample_lib (100%)

diff --git a/.gitmodules b/.gitmodules
index 56e371e5a..9aa55c132 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,36 +9,36 @@
 [submodule "psp"]
 	path = psp
 	url = https://github.com/nasa/PSP.git
-        branch = master
+  branch = main
 [submodule "apps/ci_lab"]
 	path = apps/ci_lab
 	url = https://github.com/nasa/ci_lab.git
-        branch = master
+  branch = main
 [submodule "apps/sample_app"]
 	path = apps/sample_app
 	url = https://github.com/nasa/sample_app.git
-        branch = master
+	branch = main
 [submodule "apps/sample_lib"]
-	path = apps/sample_lib
+	path = libs/sample_lib
 	url = https://github.com/nasa/sample_lib.git
-        branch = master
+  branch = main
 [submodule "apps/sch_lab"]
 	path = apps/sch_lab
 	url = https://github.com/nasa/sch_lab.git
-        branch = master
+  branch = main
 [submodule "apps/to_lab"]
 	path = apps/to_lab
 	url = https://github.com/nasa/to_lab.git
-        branch = master
+  branch = main
 [submodule "tools/cFS-GroundSystem"]
 	path = tools/cFS-GroundSystem
 	url = https://github.com/nasa/cFS-GroundSystem.git
-        branch = master
+  branch = main
 [submodule "tools/elf2cfetbl"]
 	path = tools/elf2cfetbl
 	url = https://github.com/nasa/elf2cfetbl.git
-        branch = master
+  branch = main
 [submodule "tools/tblCRCTool"]
 	path = tools/tblCRCTool
 	url = https://github.com/nasa/tblCRCTool.git
-        branch = master
+  branch = main
diff --git a/apps/sample_lib b/libs/sample_lib
similarity index 100%
rename from apps/sample_lib
rename to libs/sample_lib

From 94721a63e38613087e62a83fe2d4d112df9f7999 Mon Sep 17 00:00:00 2001
From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com>
Date: Fri, 13 Aug 2021 10:33:23 -0400
Subject: [PATCH 2/2] IC:2021-08-17, cFE v6.8.0-rc1+dev873

**Combines**

nasa/cFE#1808, v6.8.0-rc1+dev873

**Includes**

- nasa/cFE#1790, Port "CFE_UtAssert_SuccessCheck" and related macros from coverage test to functional test #1784, add CFE assert macros to functional test
- nasa/cFE#1779, Adds invalid id syslog to for CFE_ES_DeleteApp and CFE_ES_ReloadApp and verifies required reporting
- nasa/cFE#1785, Stop memory leak & add cds size test.
- nasa/cFE#1765, Mark read only inputs as const
- nasa/cFE#1804, Check resource ID idx is less than max
- nasa/cFE#1778, Add ES Application Behavior Functional Tests
- nasa/cFE#1801, Update CFE_ES_RunLoop documentation
- nasa/cFE#1745, Add Message Api Functional Test
- nasa/cFE#1798, update in/out status and nonnull/nonzero tags
- nasa/cFE#1783, Add External Time Source Functional Tests
- nasa/cFE#1800, Add Perf API functional tests

Co-authored-by: Jacob Hageman <skliper@users.noreply.github.com>
Co-authored-by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored-by: Alex Campbell <zanzaben@users.noreply.github.com>
Co-authored-by: Niall Mullane <nmullane@users.noreply.github.com>
Co-authored-by: Paul <pavll@users.noreply.github.com>
---
 cfe | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cfe b/cfe
index eb9c52319..a0c2de629 160000
--- a/cfe
+++ b/cfe
@@ -1 +1 @@
-Subproject commit eb9c52319fb1f31f72159551735ad5f1365e5a79
+Subproject commit a0c2de62934e61a93bb4282c0fc784cf4be50da9