Merge remote-tracking branch 'sarava/master'
authorMicah Anderson <micah@riseup.net>
Fri, 25 Mar 2011 04:59:48 +0000 (00:59 -0400)
committerMicah Anderson <micah@riseup.net>
Fri, 25 Mar 2011 04:59:48 +0000 (00:59 -0400)
Conflicts:
manifests/defines/line.pp
manifests/defines/module_dir.pp
manifests/defines/module_file.pp
manifests/init.pp

1  2 
manifests/defines/line.pp
manifests/defines/module_file.pp

  #             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}'" ) }
Simple merge