]> git.donarmstrong.com Git - dsa-puppet.git/commit
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Wed, 26 Aug 2009 09:50:50 +0000 (11:50 +0200)
committerPeter Palfrader <peter@palfrader.org>
Wed, 26 Aug 2009 09:50:50 +0000 (11:50 +0200)
commitf9c4671764a79754a256a7d89989f46f686fe4cd
tree7e5ca61cf5b835ce417d6986fc2bef77a8495d4f
parent381122c2ab40e9b48a52d6f0f27812687a988fbf
parentf4c083192167b6d2aca3e9fb74cbc00c20dd44fd
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:
  Ignore /etc/apache2/conf.d/ressource-limits
  set apache ressource limits (RT#1481)
  more hosts use default buildd software
  lebrun becomes standard buildd