Merge pull request #473 from GEOS-ESM/feature/mathomp4/update-for-226…

…-release Update CHANGELOG and version for 2.2.6
GEOS-ESM · Jun 26, 2020 · 36e5e3a · 36e5e3a
2 parents f5ab59a + 89208a9
commit 36e5e3a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Removed
 
+## [2.2.6] - 2020-06-26
+
+### Fixed
+
+- Fixed double timers from profiler (#472)
+
 ## [2.2.5] - 2020-06-24
 
 ### Fixed

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)
 
 project (
   MAPL
-  VERSION 2.2.5
+  VERSION 2.2.6
   LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/ESMA_cmake)