From 30635f856d28177ed2fcea0b3dd1512e7f8cdf9d Mon Sep 17 00:00:00 2001
From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com>
Date: Wed, 17 Nov 2021 21:31:06 -0500
Subject: [PATCH] Update build baseline and bump to v6.0.0-rc4+dev15

- Set new build baseline for cFS-Caelum-rc4: v6.0.0-rc4
---
 README.md                  | 13 +++++++++++++
 src/os/inc/osapi-version.h |  6 +++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 7d1deac5e..cbbb80a25 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,18 @@ The autogenerated OSAL user's guide can be viewed at <https://github.com/nasa/cF
 
 ## Version History
 
+### Development Build: v6.0.0-rc4+dev15
+
+- Add Duplicate Check to Local Unit Test
+- Rename OS_XXXTime to OS_XXXLocalTime in comments
+- Fix vxWorks intLib stub aliasing issue
+- Recognize ifdef __cplusplus
+- Remove extern in stub prototypes
+- Add typedef for OSAL status codes
+- Set new build baseline for cFS-Caelum-rc4: v6.0.0-rc4
+- See <https://github.com/nasa/osal/pull/1191> and <https://github.com/nasa/cFS/pull/390>
+
+
 ### Development Build: v5.1.0-rc1+dev619
 
 - Enable symbol api test and MIR dump too large
@@ -18,6 +30,7 @@ The autogenerated OSAL user's guide can be viewed at <https://github.com/nasa/cF
 - Add bsp-specific configuration flag registry 
 - Add os-specifc socket flag function 
 - See <https://github.com/nasa/osal/pull/1158> and <https://github.com/nasa/cFS/pull/359>
+
 ### Development Build: v5.1.0-rc1+dev604
 
 - Add typecast to memchr call
diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h
index 9c1ad5b6e..6e4ce779a 100644
--- a/src/os/inc/osapi-version.h
+++ b/src/os/inc/osapi-version.h
@@ -36,8 +36,8 @@
 /*
  * Development Build Macro Definitions
  */
-#define OS_BUILD_NUMBER   619
-#define OS_BUILD_BASELINE "v5.1.0-rc1"
+#define OS_BUILD_NUMBER   15
+#define OS_BUILD_BASELINE "v6.0.0-rc4"
 
 /*
  * Version Macro Definitions
@@ -68,7 +68,7 @@
 /*! @brief Version code name
  * All modular components which are tested/validated together should share the same code name
  */
-#define OS_VERSION_CODENAME "Bootes"
+#define OS_VERSION_CODENAME "Draco"
 
 /*! @brief Development Build Version String.
  * @details Reports the current development build's baseline, number, and name. Also includes a note about the latest