From: Stephen Gran <steve@lobefin.net>
Date: Fri, 10 Jun 2011 19:20:56 +0000 (+0100)
Subject: Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=2249f2e8a1fad18f9a6a9195ebc912ee448e0005;hp=-c;p=mirror%2Fdsa-puppet.git

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

2249f2e8a1fad18f9a6a9195ebc912ee448e0005
diff --combined modules/portforwarder/misc/config.yaml
index 13c331029,7ce085d5f..701480238
--- a/modules/portforwarder/misc/config.yaml
+++ b/modules/portforwarder/misc/config.yaml
@@@ -5,11 -5,6 +5,11 @@@
  # port on the remote instead of just encoding it in authkeys.
  
  # from host:port to host:port
 +alioth.debian.org:
 +  - source_bind_port: 5441
 +    target_host: samosa.debian.org
 +    target_port: 5441
 +
  master.debian.org:
    - source_bind_port: 5441
      target_host: samosa.debian.org
@@@ -51,6 -46,7 +51,7 @@@ stabile.debian.org
    - source_bind_port: 15433
      target_host: sibelius.debian.org
      target_port: 5433
+     ssh_options: -oAddressFamily=inet
  
  franck.debian.org:
    - source_bind_port: 5443