diff options
author | Gabriel Filion <gabster@lelutin.ca> | 2014-12-13 09:34:56 -0500 |
---|---|---|
committer | Gabriel Filion <gabster@lelutin.ca> | 2014-12-13 10:21:25 -0500 |
commit | 48272434978f95c70e34aebe9ce188157f8f935e (patch) | |
tree | 8c940d891cbcba026d56cf8ed2935361debc44fd /manifests/client/centos.pp | |
parent | 7e03247a9e219fe8e57d544957eb06e305e69fc1 (diff) | |
parent | 27c9a5dbc2083dcc20d059008702dd3f75382bcc (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/client/centos.pp')
-rw-r--r-- | manifests/client/centos.pp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/manifests/client/centos.pp b/manifests/client/centos.pp deleted file mode 100644 index 3a7151b..0000000 --- a/manifests/client/centos.pp +++ /dev/null @@ -1,3 +0,0 @@ -class munin::client::centos inherits munin::client::package { - include munin::plugins::centos -} |