summaryrefslogtreecommitdiff
path: root/manifests/plugins/centos.pp
diff options
context:
space:
mode:
authorGabriel Filion <gabster@lelutin.ca>2014-12-13 09:34:56 -0500
committerGabriel Filion <gabster@lelutin.ca>2014-12-13 10:21:25 -0500
commit48272434978f95c70e34aebe9ce188157f8f935e (patch)
tree8c940d891cbcba026d56cf8ed2935361debc44fd /manifests/plugins/centos.pp
parent7e03247a9e219fe8e57d544957eb06e305e69fc1 (diff)
parent27c9a5dbc2083dcc20d059008702dd3f75382bcc (diff)
Merge remote-tracking branch 'immerda/master' into merge_immerda
Conflicts: manifests/plugins/interfaces.pp $real_ifs was changed on master and we'd like to keep that change $ifs was changed to use the prefix() function and we'd like to keep that change.
Diffstat (limited to 'manifests/plugins/centos.pp')
-rw-r--r--manifests/plugins/centos.pp3
1 files changed, 0 insertions, 3 deletions
diff --git a/manifests/plugins/centos.pp b/manifests/plugins/centos.pp
deleted file mode 100644
index 60c706c..0000000
--- a/manifests/plugins/centos.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class munin::plugins::centos inherits munin::plugins::base {
- munin::plugin { users: ensure => present; }
-}