projects / mirror / dsa-puppet.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7eda2c2 06baece)
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Sat, 20 Aug 2011 19:29:57 +0000 (21:29 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Sat, 20 Aug 2011 19:29:57 +0000 (21:29 +0200)
commit7dbf6f0c9acd692efd3bd716dddd5ba34700022b
treed8394e5afb4332386b13f12510bedeaa35f0a61atree | snapshot
parent7eda2c21390c904cd3e77850c61624f0360a6933commit | diff
parent06baecee2284cd8c098a568e24b1080b82d5e800commit | diff
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  no more afs stuff
  antheil → squeeze
  agricola, abel → squeeze
  arcadelt → squeeze
  Hard code merikanto and orff's IPs for NAT-ed hosts
  Add virt_aliases_regex router
  Strip [] out of the RT tag too
Unnamed repository; edit this file 'description' to name the repository.