Merge branch '368-release-updates' into 'hotfix/1.2.1'

(#368) Update changelog and set HDTN version to 1.2.1. See merge request hdtn-v4/hdtn!329
nasa · Apr 26, 2024 · 2aca16c · 2aca16c
2 parents d59202e + 334ae4c
commit 2aca16c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+## [1.2.1] - 2024-04-26
+
+### Fixed
+
+* Fixed a race condition in egress that caused dropped bundles.  Handle the error where no outduct exists for a bundle in egress.  Egress now returns that bundle to its sender.  This condition is careful not to mark the link down in storage or ingress.
+* Fixed missing function calls in the router to recompute routes when using the link up and link down API calls.
+
+### Changed
+
+* Write fatal level errors to a fatal level log file when CMake cache variable `LOG_TO_ERROR_FILE=ON`
+
 ## [1.2.0] - 2024-04-05
 
 ### Fixed

diff --git a/common/include/HdtnVersion.hpp b/common/include/HdtnVersion.hpp
@@ -29,7 +29,7 @@
  //  HDTN_VERSION / 100000 is the major version
  //  00.000.00 where MAJOR_MINOR_PATCH
 
-#define HDTN_VERSION 100200
+#define HDTN_VERSION 100201
 
 #define HDTN_VERSION_PATCH (HDTN_VERSION % 100)
 #define HDTN_VERSION_MINOR ((HDTN_VERSION / 100) % 1000)