]> 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, 28 Sep 2009 08:57:59 +0000 (10:57 +0200)
committerPeter Palfrader <peter@palfrader.org>
Mon, 28 Sep 2009 08:57:59 +0000 (10:57 +0200)
commitc7c04448723b39228f2cf19b0c15c6158dfae8d7
tree82853eb41bea5489fc0d12522798b78a413570fe
parent0ebd75a2ccfffc2308c95ee56b1f976b81b36100
parent8d4543b05a74ea90f60936e3654fb40583243bd0
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:
  but fano, surprisingly, has a different IP than finzi
  dijkstra also relays for fano
  still picky erb
  picky picky erb
  silly typo
  inc-debian.org now a template
  Remove samosa from nrpe allowed hosts, add draghi
  looks like I broke this when switching to named variables