projects / mirror / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c6e9a22 c36d259)
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)
* '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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.