Merge branch 'master' into em-device-ports-json

Conflicts: Netdisco/lib/App/Netdisco/Web/Device.pm
2014-11-16 21:59:35 +00:00
parent dd6904cb18 f6ae7be611
commit 269cbf8708
26 changed files with 179 additions and 92 deletions
--- a/Netdisco/share/config.yml
+++ b/Netdisco/share/config.yml
@@ -198,6 +198,7 @@ nbtstat_only: []
 nbtstat_max_age: 7
 nbtstat_interval: 0.02
 nbtstat_timeout: 1
+node_freshness: 0
 expire_devices: 60
 expire_nodes: 90
 expire_nodes_archive: 60