From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 8 Nov 2009 11:33:03 +0000 (+0100)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d786f4ec40f28a617b962f753c1350e924f91f52;p=dsa-puppet.git

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

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  vsftpd plugin needs logtail
  vsftpd probably needs this, sigh
  add vsftpd stats pron
  let's blow ries' apache up
  more hosters
  Some debug output to make sure this works as I expect
  a few more hosters
  Add a prototype whohosts function for grouping machines at a common
  fix prototype deprecation warning
  try an experiment
---

d786f4ec40f28a617b962f753c1350e924f91f52