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

diff --git a/.gitignore b/.gitignore
index 60148ce935b9591c6a4dc3f77bd1e88c8868edfb..df6b78df2ef3cea8d211268d9fca0e44dd43949f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 puppet.conf
 .config-version
+hiera.yaml
 modules/nagios/files/dsa-nagios
 modules/exim/files/certs/
 modules/ssl/files/
 modules/dacs/files/private
+modules/hiera-puppet