From: Peter Palfrader Date: Thu, 21 Jan 2010 18:31:12 +0000 (+0100) Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=45c80304279ca3f7e6db329cbf8e4566433ed35e;hp=be048a6b79feecd6cc986e6aa9c37f58b0e92eee;p=dsa-puppet.git 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: (40 commits) somehow missed mayer fuck, really, stop stop including ferm for now apparently, puppet is not fond of sloppy line endings Revert "Revert "not breaking the paths in production branch maybe helps"" try without extra whitespace Revert "not breaking the paths in production branch maybe helps" Revert "Revert "not breaking the paths in production branch maybe helps"" Revert "not breaking the paths in production branch maybe helps" not breaking the paths in production branch maybe helps single quotes single quotes Revert "does that work?" does that work? Revert "maybe staging needs a default environment of staging?" the right path helps we lost two lines picky puppet ferm initial checkin Initial stab at adding a ferm module ... --- diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index b98e6d83..f5c35437 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -6,8 +6,10 @@ nameinfo: ancina.debian.org: Giovanni Giovenale Ancina (19 October 1545 - August 30, 1604) arcadelt.debian.org: Jacques Arcadelt (also Jacob Arcadelt) (?1507 - October 14, 1568) argento.debian.org: Dominick Argento (b. October 27, 1927) + barber.debian.org: Samuel Barber (1910 - 1981) bartok.debian.org: Béla Viktor János Bartók (March 25, 1881 - September 26, 1945) bellini.debian.org: Vincenzo Salvatore Carmelo Francesco Bellini (November 3rd, 1801 - September 23rd, 1835) + biber.debian.org: Heinrich Ignaz Franz von Biber (1664 - 1704) brahms.debian.org: Johannes Brahms (May 7, 1833 - April 3, 1897) busoni.debian.org: Ferruccio Dante Michelangiolo Benvenuto Busoni (April 1, 1866 - July 27, 1924) byrd.debian.org: William Byrd (1543 - 1623) @@ -41,6 +43,7 @@ nameinfo: morales.debian.org: Cristóbal de Morales (c. 1500 - between September 4 and October 7, 1553) morricone.debian.org: Ennio Morricone (November 10, 1928 - ) mundy.debian.org: William Mundy (c. 1529 - 1591) + orff.debian.org: Carl Orff (1895 - 1982) paer.debian.org: Ferdinando Paër (July 1, 1771 - May 3, 1839) paganini.debian.org: Niccolò Paganini (October 27, 1782 – May 27, 1840) penalosa.debian.org: Francisco de Peñalosa (c. 1470 - April 1, 1528)