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/plugins/vserver.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/plugins/vserver.pp')
| -rw-r--r-- | manifests/plugins/vserver.pp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/manifests/plugins/vserver.pp b/manifests/plugins/vserver.pp index e3eec05..5dc6431 100644 --- a/manifests/plugins/vserver.pp +++ b/manifests/plugins/vserver.pp @@ -1,7 +1,7 @@ +# vserver specific plugins class munin::plugins::vserver { munin::plugin { - [ netstat, processes ]: + [ 'netstat', 'processes' ]: ensure => present; } } - |