Merge branch 'master' into issue-1650

This commit is contained in:
Aaron Daniels
2016-01-15 17:52:40 +10:00
38 changed files with 811 additions and 222 deletions
+1
View File
@@ -76,3 +76,4 @@ foreach ($periods as $period) {
echo "</div>";
}
}
unset($graph_array);
+4
View File
@@ -25,6 +25,10 @@ $oxidized_conf = array(
'descr' => 'Set the default group returned',
'type' => 'text',
),
array('name' => 'oxidized.reload_nodes',
'descr' => 'Reload Oxidized nodes list, each time a device is added',
'type' => 'checkbox',
),
);
$unixagent_conf = array(