From c3a9995914073b02735410b8496c51311d0ef2fa Mon Sep 17 00:00:00 2001
From: Brian Stinson <bstinson@centosproject.org>
Date: Jan 02 2020 15:04:36 +0000
Subject: merge pr/5 and fix version/changelog conflicts


---

diff --git a/SOURCES/CentOS-CR.repo b/SOURCES/CentOS-CR.repo
index 1fa1530..70b579b 100644
--- a/SOURCES/CentOS-CR.repo
+++ b/SOURCES/CentOS-CR.repo
@@ -13,16 +13,11 @@
 # The CR repo is shipped in a disabled state by default; its important that users
 # understand the implications of turning this on.
 #
-# NOTE: We do not use a mirrorlist for the CR repos, to ensure content is available
-#       to everyone as soon as possible, and not need to wait for the external
-#       mirror network to seed first. However, many local mirrors will carry CR repos
-#       and if desired you can use one of these local mirrors by editing the baseurl
-#       line in the repo config below.
-#
 
 [cr]
 name=CentOS-$releasever - cr
-baseurl=http://mirror.centos.org/$contentdir/$releasever/cr/$basearch/os/
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=cr&infra=$infra
+#baseurl=http://mirror.centos.org/$contentdir/$releasever/cr/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
diff --git a/SPECS/centos-release.spec b/SPECS/centos-release.spec
index 76850c0..def7227 100644
--- a/SPECS/centos-release.spec
+++ b/SPECS/centos-release.spec
@@ -249,9 +249,9 @@ rm -rf %{buildroot}
 /etc/pki/rpm-gpg/
 
 %changelog
-* Thu Jan 02 2020 Neal Gompa <ngompa@centosproject.org> - 8-1.0.8
-- Add base module platform Provides so DNF can auto-discover modular platform
-- Fix the PLATFORM_ID definition in os-release(5) to use base_release_version macro
+* Thu Jan 02 2020 Brian Stinson <bstinson@centosproject.org> - 8-1.0.8
+- Add base module platform Provides so DNF can auto-discover modular platform (ngompa)pr#6
+- Switched CR repo to mirrorlist to spread the load (arrfab)pr#5
 
 * Thu Dec 19 2019 bstinson@centosproject.org - 8-1.0.7
 - Typo fixes