From de3e1e1cec5b7944e91123acc86e7a7911f7ba5b Mon Sep 17 00:00:00 2001
From: Chris Fischer <fischer@ucar.edu>
Date: Fri, 25 Oct 2019 11:29:37 -0600
Subject: [PATCH] Update for cime5.6.25

---
 ChangeLog | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d31a74e61ee..4000ee93404 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,36 @@
 ======================================================================
 
+Originator: Chris Fischer 
+Date: 10-25-2019
+Tag: cime5.6.25
+Answer Changes: None
+Tests: SMS_Ld1_D.f19_g17.I1850Clm50BgcCropCmip6.cheyenne_gnu.clm-default
+Dependencies:
+
+Brief Summary:
+    - Cherry-picked AQPCONST changes.
+    - Fix mpi_bcast in seq_flux_mct.
+
+User interface changes: 
+
+PR summary: git log --oneline --first-parent [previous_tag]..master 
+03cb90660 Merge pull request #3266 from ESMCI/aqp_cherrypick
+f75914619 Merge pull request #3261 from jedwards4b/seq_flux_mct_fix
+
+Modified files: git diff --name-status [previous_tag]
+M       src/components/data_comps/docn/cime_config/buildnml
+M       src/components/data_comps/docn/cime_config/config_component.xml
+M       src/components/data_comps/docn/cime_config/namelist_definition_docn.xml
+M       src/components/data_comps/docn/docn_comp_mod.F90
+M       src/components/data_comps/docn/docn_shr_mod.F90
+M       src/drivers/mct/main/seq_flux_mct.F90
+M       src/share/util/shr_scam_mod.F90
+
+
+======================================================================
+
+======================================================================
+
 Originator: Chris Fischer 
 Date: 9-30-2019
 Tag: cime5.6.24