From 66d624ec17b039122c07742e7f1cc15c05bb20c4 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 11 Jun 2020 08:02:08 -0400 Subject: [PATCH 1/2] Update CHANGELOG for release --- CHANGELOG.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c7c45b1ea45..5e79867961dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,12 +8,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Changed -Added MODE argument to MAPL_RecordAlarmIsNeeded. This is in sync with "yuri-s2s3-unstable-SLES12" CVS tag. Needed for "dual ocean" ### Fixed -Fixed logger creation (similar fix was already applied to develop branch to fix issue #397) ### Removed ### Added +## [2.1.5] - 2020-06-11 + +### Changed + +- Added MODE argument to MAPL_RecordAlarmIsNeeded. This is in sync with "yuri-s2s3-unstable-SLES12" CVS tag. Needed for "dual ocean" + +### Fixed + +- Fixed logger creation (similar fix was already applied to develop branch to fix issue #397) + ## [2.1.4] - 2020-05-21 ### Fixed From d3e07f7379a158273d2fd694bed14b66ea689ffa Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 11 Jun 2020 08:34:08 -0400 Subject: [PATCH 2/2] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a7fd6d6f4fd0..2858e203ecb1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW) project ( MAPL - VERSION 2.1.3 + VERSION 2.1.5 LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/@cmake)