From: Martin Zobel-Helas <zobel@debian.org>
Date: Mon, 28 Mar 2011 09:03:27 +0000 (+0200)
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=15062a72439ce99b64b0a4e663aaf6023a313259;hp=71aa8a92dd6f22c5c9faf70ac7700879b8be1d2a;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:
  give the debbugs people access to the debbugs-mirror user too
  busoni on squeeze
  pettersson on squeeze
  stabile on squeeze
  soler on squeeze
  schumann on squeeze
  villa on squeeze
  mpt raid gets confined to linux for now
  Exim should also accept v6 connections over lo
---

diff --git a/modules/portforwarder/misc/config.yaml b/modules/portforwarder/misc/config.yaml
index 75bc81bc..ad9abaa8 100644
--- a/modules/portforwarder/misc/config.yaml
+++ b/modules/portforwarder/misc/config.yaml
@@ -28,7 +28,7 @@ paganini.debian.org:
 quantz.debian.org:
   # qa->projectb mirror
   - source_bind_port: 5433
-    target_host: merkel.debian.org
+    target_host: ries.debian.org
     target_port: 5433
   # qa->udd
   - source_bind_port: 5441