f0o 2467b11290 Merge branch 'issue-laf-110-new' of git://github.com/laf/librenms into laf-issue-laf-110-new ...

Conflicts:
	html/pages/health/mempool.inc.php
	includes/defaults.inc.php

2015-06-07 10:44:39 +00:00

..

ack-alert.inc.php

…

alert-templates.inc.php

…

attach-alert-template.inc.php

…

callback-clear.inc.php

…

callback-statistics.inc.php

…

config-item-disable.inc.php

…

config-item-update.inc.php

…

config-item.inc.php

…

create-alert-item.inc.php

…

create-device-group.inc.php

…

create-map-item.inc.php

…

delete-alert-map.inc.php

…

delete-alert-rule.inc.php

…

delete-alert-template.inc.php

…

delete-device-group.inc.php

…

discovery-module-update.inc.php

…

health-update.inc.php

…

parse-alert-map.inc.php

…

parse-alert-rule.inc.php

…

parse-alert-template.inc.php

…

parse-device-group.inc.php

…

parse-poller-groups.inc.php

…

parse-template-rules.inc.php

…

poller-group-remove.inc.php

…

poller-groups.inc.php

…

poller-module-update.inc.php

…

rediscover-device.inc.php

…

schedule-maintenance.inc.php

…

sensor-alert-reset.inc.php

…

sensor-alert-update.inc.php

…

token-item-create.inc.php

…

token-item-disable.inc.php

…

token-item-remove.inc.php

…

update-alert-rule.inc.php

…

update-config-item.inc.php

…