From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 24 Aug 2010 11:05:13 +0000 (+0200)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ced24f26ea3c69f21aa8f9c8c38b43c3ac21d9f4;hp=-c;p=mirror%2Fdsa-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:
  no more puccini here
  bye bye byrd(ie)
  make http_limit opt-in rather than out
  actually reload ferm when the Ferm::Rules change
  only add limit rules where they are going to be used
---

ced24f26ea3c69f21aa8f9c8c38b43c3ac21d9f4