Merge branch 'develop' into bugfix/wjiang/getAerosolSum

.github/CODEOWNERS

@@ -7,28 +7,12 @@
 * @GEOS-ESM/aerosol-team
 
 # NOAA Extras are Tom, Weiyuan for now
-/CCPP/                  @tclune @weiyuan-jiang
-/ESMF/Aerosol_GridComp/ @tclune @weiyuan-jiang
-/ESMF/NUOPC/            @tclune @weiyuan-jiang
-/ESMF/Shared/           @tclune @weiyuan-jiang
-/ESMF/UFS/              @tclune @weiyuan-jiang
-
-/ESMF/GOCART_GridComp/   @GEOS-ESM/aerosol-team
-
-# GOCART2G is Elliot for now
-/ESMF/GOCART2G_GridComp/ @GEOS-ESM/aerosol-team
+/CCPP/                  @GEOS-ESM/mapl-team @amdasilva
+/ESMF/Aerosol_GridComp/ @GEOS-ESM/mapl-team @amdasilva
+/ESMF/NUOPC/            @GEOS-ESM/mapl-team @amdasilva
+/ESMF/UFS/              @GEOS-ESM/mapl-team @amdasilva
 
 # The CMake Team should know/approve these
-/.github/    @GEOS-ESM/cmake-team
-/.circleci/  @GEOS-ESM/cmake-team
-/.codebuild/ @GEOS-ESM/cmake-team
-
-# The GEOS CMake Team should be notified about and approve config changes
-/config/ @GEOS-ESM/cmake-team
-
-# The Python Transition Team will own Python files
-# until the Python 3 transition is completed
-*.py @GEOS-ESM/python-transition-team
-
-# The GEOS CMake Team is the CODEOWNER for the CMakeLists.txt files in this repository
-CMakeLists.txt @GEOS-ESM/cmake-team
+/.github/    @GEOS-ESM/cmake-team @amdasilva
+/.circleci/  @GEOS-ESM/cmake-team @amdasilva
+/.codebuild/ @GEOS-ESM/cmake-team @amdasilva

CHANGELOG.md

@@ -13,7 +13,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - This matches the styles currently used in MAPL (2 space indents in CMake and yaml, 4 spaces for Python)
 
 ### Changed
+
 - Fix bug in getAerosolSum
+- Update `CODEOWNERS` file to make approvals less restrictive
 - Updated the CircleCI to use circleci-tools 0.13.0 orb
   - Moves CI to use Baselibs 6.2.13 needed by MAPL development
 - Update `components.yaml` to be in line with GEOSgcm v10.22.1