Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

diff --git a/.gitignore b/.gitignore
index 958b5b9379e2dbfa68fc83fac539501d2a234988..dcb5fa66eb5081566b5351ff83eed3a2f8fad09e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 puppet.conf
 modules/nagios/files/dsa-nagios
+modules/exim/files/certs/

diff --git a/files/etc/apt/preferences b/files/etc/apt/preferences
index fdd5712f987375e31a259446f944142fc24557b6..9fbf5cc0e59d15495b4654c1d096575bb486c2ed 100644 (file)
--- a/files/etc/apt/preferences
+++ b/files/etc/apt/preferences
@@ -14,6 +14,10 @@ Package: buildd
 Pin: release o=buildd.debian.org
 Pin-Priority: 500
 
+Package: buildd-builder-meta
+Pin: release o=buildd.debian.org
+Pin-Priority: 500
+
 Package: *
 Pin: release o=buildd.debian.org
 Pin-Priority: -1