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

[mirror/dsa-puppet.git] / modules / portforwarder / misc / config.yaml

diff --git a/modules/portforwarder/misc/config.yaml b/modules/portforwarder/misc/config.yaml
index 1d723c9..d47c2ce 100644 (file)
--- a/modules/portforwarder/misc/config.yaml
+++ b/modules/portforwarder/misc/config.yaml
@@ -10,11 +10,6 @@ master.debian.org:
     target_host: samosa.debian.org
     target_port: 5441
 
-merkel.debian.org:
-  - source_bind_port: 5441
-    target_host: samosa.debian.org
-    target_port: 5441
-
 samosa.debian.org:
   - source_bind_port: 5433
     target_host: grieg.debian.org