From b23d2c0e2c929dd1d78f6aa4196344c985687c9f Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 6 Feb 2020 07:18:27 -0700 Subject: [PATCH] Update submodule pointer for ccpp/framework and revert change to .gitmodules (#56) --- .gitmodules | 6 ++---- ccpp/framework | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index aaf744040..ce3c59e85 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,10 +4,8 @@ branch = ufs_public_release [submodule "ccpp/framework"] path = ccpp/framework - #url = https://github.com/NCAR/ccpp-framework - #branch = release/public-v4 - url = https://github.com/climbfuji/ccpp-framework - branch = remove_libxml2 + url = https://github.com/NCAR/ccpp-framework + branch = release/public-v4 [submodule "ccpp/physics"] path = ccpp/physics url = https://github.com/NCAR/ccpp-physics diff --git a/ccpp/framework b/ccpp/framework index a6e4dc6ea..eb9e33ba3 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit a6e4dc6ea3d9f4ca436a9d079bdea2dcb24f4617 +Subproject commit eb9e33ba3991864ffa70b67e14ac1c9771c37a73