projects / mirror / dsa-puppet.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6c5c683 8025f41)
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Tue, 24 Aug 2010 11:05:13 +0000 (13:05 +0200)
committerPeter Palfrader <peter@palfrader.org>
Tue, 24 Aug 2010 11:05:13 +0000 (13:05 +0200)
commitced24f26ea3c69f21aa8f9c8c38b43c3ac21d9f4
treef7f79419dfd7880147f75a2a424963a4da27dfdctree | snapshot
parent6c5c6836db020d25288c0e3318befc13340ebfd3commit | diff
parent8025f41316ae4139e237a9756e3732c35d63e455commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.