Merge pull request #2630 from nasa/integration-candidate

cFE Integration candidate: Equuleus-rc1+dev23

Author: dzbaker

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: equuleus-rc1+dev227
+- Add CFE_TBL_BufferSelect_Enum_t Type Name
+- See <https://github.com/nasa/cFE/pull/2629>
+
 ## Development Build: equuleus-rc1+dev223
 - Correct type of ActiveTableFlag variable
 - See <https://github.com/nasa/cFE/pull/2459>

modules/core_api/fsw/inc/cfe_version.h

@@ -26,7 +26,7 @@
 #define CFE_VERSION_H
 
 /* Development Build Macro Definitions */
-#define CFE_BUILD_NUMBER    223 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
+#define CFE_BUILD_NUMBER    227 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
 #define CFE_BUILD_BASELINE  "equuleus-rc1" /**< @brief Development: Reference git tag for build number */
 #define CFE_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
 #define CFE_BUILD_CODENAME  "Equuleus"     /**< @brief: Development: Code name for the current build */

modules/tbl/config/default_cfe_tbl_msgdefs.h

@@ -30,6 +30,7 @@
 #include "cfe_mission_cfg.h"
 #include "cfe_es_extern_typedefs.h"
 #include "cfe_time_extern_typedefs.h"
+#include "cfe_tbl_extern_typedefs.h"
 #include "cfe_tbl_fcncodes.h"
 
 /********************************/