Merge commit 'e7d23dabf191c5416197af0b229fc90b94539405'

Conflicts:
	manifests/client.pp
	manifests/client/base.pp
	manifests/client/darwin.pp
	manifests/client/debian.pp
	manifests/client/gentoo.pp
	manifests/client/openbsd.pp
	manifests/client/package.pp
	manifests/host.pp
	manifests/init.pp
	manifests/plugin.pp
	manifests/plugin/scriptpaths.pp
	manifests/plugins/interfaces.pp
	manifests/plugins/linux.pp
	manifests/plugins/vserver.pp
	manifests/register.pp
	manifests/register_snmp.pp
	manifests/remoteplugin.pp
	manifests/snmp_collector.pp

1 files changed, 15 insertions, 15 deletions

diff --git a/manifests/remoteplugin.pp b/manifests/remoteplugin.pp
index cc83f8c..ce87492 100644
--- a/manifests/remoteplugin.pp
+++ b/manifests/remoteplugin.pp
@@ -1,18 +1,18 @@
-define munin::remoteplugin($ensure = "present", $source, $config = '')
-{
-  case $ensure {
-    "absent": { munin::plugin{ $name: ensure => absent } }
-    default: {
-      file { "/var/lib/puppet/modules/munin/plugins/${name}":
-    	source => $source,
-    	mode => 0755, owner => root, group => 0;
-      }
-      munin::plugin { $name:
-    	ensure => $ensure,
-    	config => $config,
-    	script_path_in => "/var/lib/puppet/modules/munin/plugins",
-      }
+define munin::remoteplugin($ensure = "present", $source, $config = '') {
+    case $ensure {
+        "absent": { munin::plugin{ $name: ensure => absent } }
+        default: {
+            file {
+                "/var/lib/puppet/modules/munin/plugins/${name}":
+                    source => $source,
+                    mode => 0755, owner => root, group => 0;
+            }
+            munin::plugin { $name:
+                ensure => $ensure,
+                config => $config,
+                script_path_in => "/var/lib/puppet/modules/munin/plugins",
+            }
+        }
     }
-  }
 }