From: Martin Zobel-Helas Date: Tue, 17 Jan 2012 11:45:27 +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=3817334616fc4370c954be504023014709fe38da;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: Try to configure ntpdate for hosts with broken RTC Revert "get rid of the apt repo until they fix it" - aba says it's all fixed Revert "This is part two of d93775534f19bde42d75c6debe391cc701c54993" Add sompek.debian.org This is part two of d93775534f19bde42d75c6debe391cc701c54993 Signed-off-by: Stephen Gran get rid of the apt repo until they fix it That cast rather too broad a net, I think Signed-off-by: Stephen Gran add some autopostgres munin stuff no more pescetti one more we ship with puppet try some dependency ordering add a preferences file for buildd/schroot another file that gets autoupdated new buildds Sort list Signed-off-by: Stephen Gran Let's try one last time to get it right. Signed-off-by: Stephen Gran comparison of Fixnum with String failed Signed-off-by: Stephen Gran Obvious syntax error ... Signed-off-by: Stephen Gran this may break a lot ... --- 3817334616fc4370c954be504023014709fe38da