diff options
author | Micah Anderson <micah@riseup.net> | 2013-04-17 16:36:37 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2013-04-17 16:36:37 -0400 |
commit | 8f7c0071eb82591477876eeb3f309067853a3261 (patch) | |
tree | b095f01b960b7ba3699da2dfa4d84cd5bb8a6361 /manifests/client/centos.pp | |
parent | ea31faee76141646c173d88bd5bec5aa4a773c1c (diff) | |
parent | a5ce0a9317fc5dd5228cff4c5b6d36366c17b6d5 (diff) |
Merge branch 'master' into leap
Conflicts:
README
manifests/host/cgi.pp
Diffstat (limited to 'manifests/client/centos.pp')
-rw-r--r-- | manifests/client/centos.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/client/centos.pp b/manifests/client/centos.pp index 42e8c59..3a7151b 100644 --- a/manifests/client/centos.pp +++ b/manifests/client/centos.pp @@ -1,3 +1,3 @@ class munin::client::centos inherits munin::client::package { - include munin::plugins::centos + include munin::plugins::centos } |