From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 2 Jan 2015 14:51:13 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build
X-Git-Tag: 5.3.7~19
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=069ac606dcbe40609c95621dfcf0744d92290886;hp=45aeacaa6ec51a6d21658d63b4443016834db945;p=build.git

Merge branch 'master' of ssh://git.onelab.eu/git/build
---

diff --git a/mirroring/f12/yum.repos.d/building.repo.in b/mirroring/f12/yum.repos.d/building.repo.in
index 6f99c04d..106ff169 100644
--- a/mirroring/f12/yum.repos.d/building.repo.in
+++ b/mirroring/f12/yum.repos.d/building.repo.in
@@ -1,15 +1,16 @@
 [fedora]
-name=Fedora 12 - $basearch
-baseurl=@MIRRORURL@/fedora/releases/12/Everything/$basearch/os/
+name=Fedora 21 - $basearch
+baseurl=@MIRRORURL@/fedora/releases/21/Everything/$basearch/os/
 enabled=1
 metadata_expire=7d
 gpgcheck=1
-gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-12-primary
+gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-21-primary
 
 [updates]
-name=Fedora 12 - $basearch - Updates
-baseurl=@MIRRORURL@/fedora/updates/12/$basearch/
+name=Fedora 21 - $basearch - Updates
+baseurl=@MIRRORURL@/fedora/updates/21/$basearch/
 enabled=1
 metadata_expire=7d
 gpgcheck=1
-gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-12-primary
+gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-21-primary
+