Aaron Daniels a77536ba4b Merge branch 'master' into issue-4083 ...

Conflicts:
	includes/definitions.inc.php

2016-08-19 07:13:46 +10:00

..

alerts

formatting error

2016-07-19 15:20:48 -07:00

caches

…

db

…

discovery

Merge branch 'master' into issue-4083

2016-08-19 07:13:46 +10:00

phpmailer

…

polling

Merge branch 'master' into issue-4083

2016-08-19 07:13:46 +10:00

services

…

snmptrap

…

sql-schema

…

alerts.inc.php

Added check for empty emails

2016-07-28 20:28:23 +01:00

billing.php

Added predicated usage to bills, basic at present

2016-08-13 01:11:20 +01:00

callback.php

…

cisco-entities.php

…

common.php

Make it easy to check for $debug condition for c_echo

2016-08-17 16:00:43 -05:00

component.php

Component Update - Status

2016-07-11 16:51:01 +10:00

console_colour.php

…

console_table.php

…

datastore.inc.php

Update nfs-stats.inc.php to use data_update

2016-07-25 20:42:37 -05:00

dbFacile.mysql.php

c_echo

2016-08-16 20:01:22 -05:00

dbFacile.mysqli.php

c_echo

2016-08-16 20:01:22 -05:00

dbFacile.php

…

defaults.inc.php

- Made module generic, not cisco specific.

2016-08-12 17:21:55 +10:00

definitions.inc.php

Merge branch 'master' into issue-4083

2016-08-19 07:13:46 +10:00

device-groups.inc.php

This probably can be deleted since it was wrong

2016-08-09 02:57:45 +02:00

exceptions.inc.php

Actually add the exceptions

2016-08-08 15:47:35 -05:00

functions.php

Merge pull request #3800 from murrant/rrd-create-remote

2016-08-10 18:44:45 +01:00

include-dir.inc.php

…

influxdb.inc.php

c_echo

2016-08-16 20:01:22 -05:00

load_db_graph_types.inc.php

…

mergecnf.inc.php

…

notifications.php

…

object-cache.inc.php

…

port-descr-parser.inc.php

…

rewrites.php

run rename only for ipmi type sensors, added the power usage sensors, updated rewrite for known hosts

2016-08-10 04:55:30 +03:00

rrdtool.inc.php

Missed $vdebug in merge

2016-08-17 16:05:15 -05:00

services.inc.php

Remove nfs requirement for distributed poller (with rrdtool 1.5+)

2016-07-07 21:10:06 -05:00

snmp.inc.php

More updates for junos bgp polling

2016-08-03 16:49:41 +01:00

static-config.php

…

syslog.php

reduction, thx an @murrant

2016-08-08 17:36:19 +02:00

vmware_guestid.inc.php

…