From: Micah Anderson <micah@riseup.net>
Date: Fri, 25 Mar 2011 04:59:48 +0000 (-0400)
Subject: Merge remote-tracking branch 'sarava/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=233229435f4dacc5c1f14e1756b0d5810448f00c;p=puppet-common.git

Merge remote-tracking branch 'sarava/master'

Conflicts:
	manifests/defines/line.pp
	manifests/defines/module_dir.pp
	manifests/defines/module_file.pp
	manifests/init.pp
---

233229435f4dacc5c1f14e1756b0d5810448f00c
diff --cc manifests/defines/line.pp
index ccfa357,44c52a0..bbe0a54
--- a/manifests/defines/line.pp
+++ b/manifests/defines/line.pp
@@@ -34,6 -33,9 +33,10 @@@
  #  		notify => Service[munin-node],
  #  		require => Package[munin-node];
  #  }
+ #
+ # Code with fixes gathered at
+ # http://reductivelabs.com/trac/puppet/wiki/Recipes/SimpleText
++>>>>>>> sarava/master
  define line($file, $line, $ensure = 'present') {
    case $ensure {
      default : { err ( "unknown ensure value '${ensure}'" ) }