mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into wrapper

Browse Source 
Conflicts:
	config.php.default
	librenms.cron
This commit is contained in:
Tyler Christiansen
2013-11-03 22:30:10 -08:00
parent fb38de86c9 42d8a3c17b
commit 2e56ae9e38
10 changed files with 221 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.php.default
View File

@@ -42,5 +42,7 @@ $config['auth_mechanism'] = "mysql"; # default, other options: ldap, http-auth
# following is necessary for poller-wrapper
# poller-wrapper is released public domain
$config['poller-wrapper']['alerter'] = FALSE;
# Uncomment the next line to disable daily updates
#$config['update'] = 0;
?>