From: Martin Zobel-Helas <zobel@debian.org>
Date: Wed, 2 Feb 2011 10:32:37 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... 
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7b2883f31b0452fa78e97b35da53bf139c8bc7eb;p=dsa-puppet.git

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

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  Revert "reger can ignore these for now"
  reger can ignore these for now
  move more files
  move more files
  the inevitable typo
  move ldap.conf as test of new file structure
  Add archive.debian.org to GeoDNS zones
  Change redirect rule on sibelius
  cannot require puppet package then, tho
  Making sure puppet is installed using puppet is probably not very useful
  Open rsyncd port in ferm based on existance of /etc/rsyncd.conf.  No longer list half our nodes by name
  Whitespace fixes for danzi
---

7b2883f31b0452fa78e97b35da53bf139c8bc7eb