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


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