diff options
| author | Micah Anderson <micah@riseup.net> | 2011-03-25 00:01:54 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2011-03-25 00:01:54 -0400 |
| commit | 5218993abef2a8bf79278d4d84123843279735c5 (patch) | |
| tree | 8fe859ba86b83e4b9782ac19a37c89bf5cf5f0ba /templates/munin-node.conf.Debian.feisty | |
| parent | b3e29447187e289c60a4a9f7830032f1b10fae2f (diff) | |
| parent | e7d23dabf191c5416197af0b229fc90b94539405 (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 'templates/munin-node.conf.Debian.feisty')
0 files changed, 0 insertions, 0 deletions