Rainer Schueler 93e059f2c1 Merge branch 'master' of https://github.com/librenms/librenms ...

Conflicts:
	includes/services/check_dhcp.inc.php

2016-04-25 08:48:04 +02:00

..

alerts

Add port parameter and code enhancement

2016-04-01 10:05:52 +02:00

caches

…

db

…

discovery

Merge branch 'master' of https://github.com/librenms/librenms

2016-04-25 08:48:04 +02:00

phpmailer

…

polling

Merge branch 'master' of https://github.com/librenms/librenms

2016-04-25 08:48:04 +02:00

services

- Added $check_cmd for check_dhcp as per:

2016-04-18 08:57:33 +10:00

snmptrap

…

sql-schema

…

alerts.inc.php

Merge pull request #3138 from f0o/minor-alerting-addons

2016-03-08 21:00:37 +00:00

billing.php

Scrut fix + Notification

2016-03-07 18:41:51 +00:00

callback.php

…

cisco-entities.php

…

common.php

Remove some deprecated functions

2016-04-24 01:05:14 -05:00

component.php

…

console_colour.php

…

console_table.php

…

datastore.inc.php

…

dbFacile.mysql.php

Revert "[WIP] Sanity!"

2016-02-17 13:59:58 +00:00

dbFacile.mysqli.php

Revert "[WIP] Sanity!"

2016-02-17 13:59:58 +00:00

dbFacile.php

…

defaults.inc.php

change from poller_module to include from os polling

2016-04-19 13:58:38 +02:00

definitions.inc.php

Merge branch 'master' of https://github.com/librenms/librenms

2016-04-25 08:48:04 +02:00

device-groups.inc.php

…

functions.php

Corrected more formatting. I don't like your coding style! :)

2016-04-19 11:53:06 +01:00

include-dir.inc.php

…

influxdb.inc.php

Version 2 of sending the correct data to influx. Also catching the exception that would stop updates working.

2016-04-12 10:01:20 +01:00

load_db_graph_types.inc.php

…

mergecnf.inc.php

…

notifications.php

Remove unnecessary array reverse

2016-03-09 12:47:11 +00:00

object-cache.inc.php

Revert "[WIP] Sanity!"

2016-02-17 13:59:58 +00:00

port-descr-parser.inc.php

…

rewrites.php

Updated FortiOS to pick up all FortiManagers + updated rewrite for hardware

2016-02-12 14:17:57 +00:00

rrdtool.inc.php

…

services.inc.php

- Ensure that $check_cmd is always set.

2016-04-12 07:34:06 +10:00

snmp.inc.php

…

snom-graphing.php

…

static-config.php

…

syslog.php

Fix log entries with timestamps included and incorrect time (leading * or .)

2016-04-12 00:05:16 -05:00

vmware_guestid.inc.php

…