summaryrefslogtreecommitdiff
path: root/manifests/plugins/vserver.pp
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2011-03-25 00:01:54 -0400
committerMicah Anderson <micah@riseup.net>2011-03-25 00:01:54 -0400
commit5218993abef2a8bf79278d4d84123843279735c5 (patch)
tree8fe859ba86b83e4b9782ac19a37c89bf5cf5f0ba /manifests/plugins/vserver.pp
parentb3e29447187e289c60a4a9f7830032f1b10fae2f (diff)
parente7d23dabf191c5416197af0b229fc90b94539405 (diff)
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
Diffstat (limited to 'manifests/plugins/vserver.pp')
-rw-r--r--manifests/plugins/vserver.pp9
1 files changed, 4 insertions, 5 deletions
diff --git a/manifests/plugins/vserver.pp b/manifests/plugins/vserver.pp
index ffc4b0a..42a9bf4 100644
--- a/manifests/plugins/vserver.pp
+++ b/manifests/plugins/vserver.pp
@@ -1,9 +1,8 @@
class munin::plugins::vserver inherits munin::plugins::base {
- munin::plugin {
- [ netstat, processes ]:
- ensure => present;
- }
-
+ munin::plugin {
+ [ netstat, processes ]:
+ ensure => present;
+ }
}