From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 9 Dec 2011 08:29:10 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build
X-Git-Tag: 5.0-rc25~5
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f7bca8d6e244e69d7b805c07ef6cc7c1018cdf98;hp=88d6d6dd953ae7645bc5bdbd0ec3fda2f54b71ef;p=build.git

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

diff --git a/mirroring/f15/yum.repos.d/building.repo.in b/mirroring/f15/yum.repos.d/building.repo.in
deleted file mode 100644
index af9fd910..00000000
--- a/mirroring/f15/yum.repos.d/building.repo.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[fedora]
-name=Fedora 15 - $basearch
-baseurl=@MIRRORURL@/fedora/releases/15/Everything/$basearch/os/
-enabled=1
-metadata_expire=7d
-gpgcheck=1
-gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-15-primary
-
-[updates]
-name=Fedora 15 - $basearch - Updates
-baseurl=@MIRRORURL@/fedora/updates/15/$basearch/
-enabled=1
-metadata_expire=7d
-gpgcheck=1
-gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-15-primary
-
diff --git a/mirroring/f16/yum.repos.d/building.repo.in b/mirroring/f16/yum.repos.d/building.repo.in
new file mode 100644
index 00000000..cc06365d
--- /dev/null
+++ b/mirroring/f16/yum.repos.d/building.repo.in
@@ -0,0 +1,16 @@
+[fedora]
+name=Fedora 16 - $basearch
+baseurl=@MIRRORURL@/fedora/releases/16/Everything/$basearch/os/
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-16-primary
+
+[updates]
+name=Fedora 16 - $basearch - Updates
+baseurl=@MIRRORURL@/fedora/updates/16/$basearch/
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-16-primary
+