Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Sun, 6 Sep 2009 18:11:03 +0000 (20:11 +0200)
committerPeter Palfrader <peter@palfrader.org>
Sun, 6 Sep 2009 18:11:03 +0000 (20:11 +0200)
commitbb73f8c3ee65404e98245d77ff45ec79da76c1eb
treeabe22956b2a49e6b3274fb3852b299f113d36414
parent6357ee1d5e5ef97b5cdb2ebdd67f999761bf7b28
parent93dca9b7b6ca55fc8340619e9c7b6de087e08b8a
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:
  apache is weird
  Oh puppet, you are so picky
  Make rlimitmem host dependent
  Make ressource-limits a template