From: Tollef Fog Heen <tfheen@err.no>
Date: Mon, 8 Apr 2013 19:57:28 +0000 (+0200)
Subject: Drop apache upcoming on merikanto to prevent cron spam
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=8eae878d974ede65e7ac5fa6eef6e91c86845bb5;p=mirror%2Fdsa-puppet.git

Drop apache upcoming on merikanto to prevent cron spam
---

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 7b90b1f31..cb8542c8b 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -231,7 +231,6 @@ host_settings:
     - senfl.debian.org
   'apache2_ftp-upcoming_mirror':
     - klecker.debian.org
-    - merikanto.debian.org
     - rietz.debian.org
   apache2_backports_mirror:
     - englund.debian.org