summaryrefslogtreecommitdiff
path: root/templates/munin-node.conf.Debian
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 /templates/munin-node.conf.Debian
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 'templates/munin-node.conf.Debian')
l---------templates/munin-node.conf.Debian1
1 files changed, 0 insertions, 1 deletions
diff --git a/templates/munin-node.conf.Debian b/templates/munin-node.conf.Debian
deleted file mode 120000
index e0646b9..0000000
--- a/templates/munin-node.conf.Debian
+++ /dev/null
@@ -1 +0,0 @@
-munin-node.conf.Debian.etch \ No newline at end of file