diff options
| author | Micah Anderson <micah@riseup.net> | 2009-12-22 19:29:23 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2009-12-22 19:29:23 -0500 |
| commit | 42c94b4fad526b25852c7bcaf053f441bac38c9e (patch) | |
| tree | 89a8da279ba7190a350ade72bc52cda90362c4b7 /templates/defaultclient.erb | |
| parent | 577ff440b791ab67de77b20440b5e385fe1c9572 (diff) | |
| parent | 76352415fec5c2ab6975e3a8843dd4983f7cae6a (diff) | |
Merge commit '76352415fec5c2ab6975e3a8843dd4983f7cae6a'
Conflicts:
README
lib/facter/acpi_available.rb
lib/facter/interfaces.rb
lib/facter/munin_interfaces.rb
manifests/client.pp
manifests/host.pp
manifests/init.pp
manifests/plugin.pp
plugins/facter/interfaces.rb
templates/defaultclient.erb
templates/munin-node.conf.Debian.lenny
Diffstat (limited to 'templates/defaultclient.erb')
| -rw-r--r-- | templates/defaultclient.erb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/templates/defaultclient.erb b/templates/defaultclient.erb index ddce1bb..7d754a7 100644 --- a/templates/defaultclient.erb +++ b/templates/defaultclient.erb @@ -11,3 +11,8 @@ address <%= munin_host_real %> port <%= munin_port_real %> use_node_name yes +<<<<<<< HEAD +======= + load.load.warning 5 + load.load.critical 10 +>>>>>>> 76352415fec5c2ab6975e3a8843dd4983f7cae6a |