From: Martin Zobel-Helas <zobel@debian.org>
Date: Tue, 7 Feb 2012 21:10:22 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7c9af8bba4c3bef111049a5f27bdaa190ee73ac6;p=mirror%2Fdsa-puppet.git

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:
  Revert "try two on this"
  try two on this
  Revert "let's test how broken this is"
  Revert "oops"
  oops
  let's test how broken this is
  Or schroot -l
  install fake-hwclock on broken-rtc machines
  no rtc for lucatelli
  samhain ignore /etc/fake-hwclock.data
  resolve ntpservers from names on puppet servers for ntpdate (used on hosts with broken rtc)
  move etc/default/ntpdate to a template
  ancina has a broken RTC
  reboot-lock
---

7c9af8bba4c3bef111049a5f27bdaa190ee73ac6