diff --git a/doc/ChangeLog b/doc/ChangeLog index 3a33553f64..d12c30e731 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,7 +1,7 @@ =============================================================== Tag name: ctsm5.2.011 Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310) -Date: Thu 11 Jul 2024 01:14:12 PM MDT +Date: Fri 12 Jul 2024 09:45:59 AM MDT One-line Summary: Merge b4b-dev Purpose and description of changes @@ -56,8 +56,8 @@ Testing summary: regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing): - derecho ----- IN PROG - izumi ------- NOT STARTED + derecho ----- OK + izumi ------- OK Answer changes -------------- diff --git a/doc/ChangeSum b/doc/ChangeSum index 892913c52f..79ee06377d 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,6 +1,6 @@ Tag Who Date Summary ============================================================================================================================ - ctsm5.2.011 slevis 07/11/2024 Merge b4b-dev + ctsm5.2.011 slevis 07/12/2024 Merge b4b-dev ctsm5.2.010 multiple 07/11/2024 Explicit A/C adoption ctsm5.2.009 erik 07/10/2024 Allow for CAM7 in lnd_tuning_mode and handle C or E in long compset names ctsm5.2.008 erik 06/28/2024 Bring changes on temp-branch to master: b4b-dev, git-fleximod, hillslope fsat