Merge branch 'master' of github.com:laf/librenms into smokeping

This commit is contained in:
laf
2015-07-07 19:58:37 +01:00
49 changed files with 588 additions and 64 deletions
@@ -197,7 +197,6 @@ if (isset($MetaGraphDefs[$type])) {
if(isset($rrd_cmd))
{
if ($config['rrdcached']) { $rrd_cmd .= " --daemon ".$config['rrdcached'] . " "; }
if ($_GET['from']) { $from = mres($_GET['from']); }
if ($_GET['to']) { $to = mres($_GET['to']); }
$rrd_cmd .= " -s " . $from . " -e " . $to;