Merge branch 'develop' into release/MAPL-v3

GEOS-ESM · Feb 13, 2025 · 68e1c18 · 68e1c18
2 parents 0e2a089 + fe820ea
commit 68e1c18
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -83,8 +83,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Update to `ESMA_env` v4.35.0 --> Baselibs 7.32.0
+  - This brings in GFE v1.19.0 (which has gFTL v1.15.2 needed for MAPL3 work)
+
 ### Fixed
-Fixed nesting of internal timers (issue #3412)
+
+- Fixed nesting of internal timers (issue #3412)
 
 ### Removed
 

diff --git a/components.yaml b/components.yaml
@@ -5,7 +5,7 @@ MAPL:
 ESMA_env:
   local: ./ESMA_env
   remote: ../ESMA_env.git
-  tag: v4.34.1
+  tag: v4.35.0
   develop: main
 
 ESMA_cmake: