From: Martin Zobel-Helas <zobel@debian.org>
Date: Sat, 26 Dec 2009 16:58:28 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=f4702fedb73ca0c0d70cc2054a64c4523d26c781;hp=9642474c23df62e15a54a82b78fb8658f86fcf38;p=mirror%2Fdsa-puppet.git

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

diff --git a/files/etc/puppet/puppet.conf b/files/etc/puppet/puppet.conf
index 931ce3ce6..732dfffc7 100644
--- a/files/etc/puppet/puppet.conf
+++ b/files/etc/puppet/puppet.conf
@@ -14,3 +14,6 @@ pluginsync=true
 [puppetmasterd]
 templatedir=/etc/puppet/templates
 libdir=/etc/puppet/lib
+
+[puppetd]
+environments = development,testing,production,staging