From: Stephen Gran <steve@lobefin.net>
Date: Sat, 21 May 2011 17:00:48 +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=802933ac23f7433f1990141cf2623d888ba7790d;hp=71397f616a903f44d73c54be8439b28ffda9e958;p=mirror%2Fdsa-puppet.git

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

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index ae44129ad..cbdadf1e4 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -257,6 +257,7 @@ host_settings:
     - holter.debian.org
     - kassia.debian.org
     - kaufmann.debian.org
+    - kokkonen.debian.org
     - krenek.debian.org
     - lamb.debian.org
     - lindberg.debian.org