From: Martin Zobel-Helas <zobel@debian.org>
Date: Sat, 19 Feb 2011 10:01:57 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... 
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=330a065899f896b7b6e1ea737c1d3be02b382f41;hp=6986d1b34c1e3223e5e3a0a321cc326a3068b392;p=dsa-puppet.git

Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  samhain ignore /etc/apache2/sites-available/www.debian.org
  abel and alwyn run tftpd
---

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index ea0eb1f0..509023c8 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -236,6 +236,7 @@ host_settings:
     - raff.debian.org
     - rautavaara.debian.org
     - reger.debian.org
+    - rem.debian.org
     - salieri.debian.org
     - schuetz.debian.org
     - sibelius.debian.org