From: Luca Filipozzi <lfilipoz@emyr.net>
Date: Mon, 16 Apr 2012 08:18:12 +0000 (+0000)
Subject: Merge branch 'master' of ssh://handel.debian.org/~/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=b6fe62a8e20b3663e9064c99f0bcaf5de50f58ae;hp=3604999c2d83fc74306e17c747b059e04bde3f3c;p=mirror%2Fdsa-puppet.git

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

diff --git a/.gitignore b/.gitignore
index 60148ce93..df6b78df2 100644
--- 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