]> 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>
Mon, 23 Nov 2009 19:39:49 +0000 (20:39 +0100)
committerPeter Palfrader <peter@palfrader.org>
Mon, 23 Nov 2009 19:39:49 +0000 (20:39 +0100)
commit9e7e4fbe95ccbc37d854ccf608b32b928bd73f31
treeaae8c4cf8b4ad6effe755de3c3db5c8552669d95
parentc6e9a2218f11401f50e2a8a8523b3ff61aba6826
parentc36d259889536d23d96a6a777e21a348954ef71c
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:
  revert RLimitMem for merkel altogether
  up the RLimitMem for hyperestraier
  voltaire doesn't need special handling anymore
  and the right path
  and quotes
  what could possibly go wrong