From: Martin Zobel-Helas Date: Sun, 22 Jan 2012 20:17:16 +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=7350d8779c32b4365716da78fff1c2d15cea44f0;hp=0c4a18c9f77bef3d9ce53433a20504ba22a283f8;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: and lenny has no /usr/sbin/service Try this Only reload nrpe server when some config files change formatting changes only --- diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index 68321d2a3..a8edfeed8 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -15,6 +15,7 @@ nameinfo: barber.debian.org: Samuel Barber (March 9th, 1910 - January 23rd, 1981) beethoven.debian.org: Ludwig van Beethoven (December 16th, 1770 - March 26th, 1827) bellini.debian.org: Vincenzo Salvatore Carmelo Francesco Bellini (November 3rd, 1801 - September 23rd, 1835) + bendel.debian.org: Franz Bendel (March 23, 1833 - July 3, 1874) berlioz.debian.org: Hector Berlioz (December 11th, 1803 - March 8th, 1869) biber.debian.org: Heinrich Ignaz Franz von Biber (August 12th, 1664 - May 3rd, 1704) blavet.debian.org: Michel Blavet (March 13, 1700 - October 28, 1768)