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

* '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 75bc81bc5d0b693ef67ee45aec66f259fcde05da..ad9abaa8eebc51c309eef48d17bd48d9d521957c 100644 (file)
--- 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