nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-27 16:08:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into branding

Browse Source
This commit is contained in:
Tyler Christiansen
2013-10-28 12:06:20 -07:00
parent b2eb12d0fe 63d428c0e1
commit 353979570f
18 changed files with 96 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+3 -1
View File
@@ -1 +1,3 @@
See the commit log at https://github.com/librenms/librenms/commits/master for details.
Please check http://www.observium.org/wiki/Changelog for an up to date changelog.
You can also browse the subversion repository commit logs for more granular updates.
README.md
+1 -1
View File
@@ -4,7 +4,7 @@ License
Copyright (C) 2006-2012 Adam Armstrong <adama@memetic.org>
Copyright (C) 2013 LibreNMS Group <librenms-project@googlegroups.com>
Copyright (C) 2013 LibreNMS Contributors <librenms-project@googlegroups.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
addhost.php
+5 -6
View File
@@ -2,15 +2,14 @@
<?php
/**
* LibreNMS
* Observium
*
* This file is part of LibreNMS
* This file is part of Observium.
*
* @package librenms
* @package observium
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*
*/
adduser.php
+5 -6
View File
@@ -2,15 +2,14 @@
<?php
/**
* LibreNMS
* Observium
*
* This file is part of LibreNMS
* This file is part of Observium.
*
* @package librenms
* @package observium
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*
*/
alerts.php
+6 -7
View File
@@ -2,15 +2,14 @@
<?php
/**
* LibreNMS
* Observium
*
* This file is part of LibreNMS
* This file is part of Observium.
*
* @package librenms
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
* @package observium
* @subpackage alerts
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*
*/
billing-calculate.php
+6 -7
View File
@@ -2,15 +2,14 @@
<?php
/**
* LibreNMS
* Observium
*
* This file is part of LibreNMS
* This file is part of Observium.
*
* @package librenms
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
* @package observium
* @subpackage billing
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*
*/
check-errors.php
+6 -7
View File
@@ -2,15 +2,14 @@
<?php
/**
* LibreNMS
* Observium
*
* This file is part of LibreNMS
* This file is part of Observium.
*
* @package librenms
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
* @package observium
* @subpackage alerts
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*
*/
check-services.php
+6 -7
View File
@@ -2,15 +2,14 @@
<?php
/**
* LibreNMS
* Observium
*
* This file is part of LibreNMS
* This file is part of Observium.
*
* @package librenms
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
* @package observium
* @subpackage services
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*
*/
delhost.php
+5 -6
View File
@@ -2,15 +2,14 @@
<?php
/**
* LibreNMS
* Observium
*
* This file is part of LibreNMS
* This file is part of Observium.
*
* @package librenms
* @package observium
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*
*/
discovery.php
+6 -7
View File
@@ -2,15 +2,14 @@
<?php
/**
* LibreNMS
* Observium
*
* This file is part of LibreNMS
* This file is part of Observium.
*
* @package librenms
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
* @package observium
* @subpackage discovery
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*
*/
generate-iplist.php
+6 -7
View File
@@ -2,15 +2,14 @@
<?php
/**
* LibreNMS
* Observium
*
* This file is part of LibreNMS
* This file is part of Observium.
*
* @package librenms
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
* @package observium
* @subpackage discovery
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*
*/
irc.php
+6 -7
View File
@@ -2,15 +2,14 @@
<?php
/**
* LibreNMS
* Observium
*
* This file is part of LibreNMS
* This file is part of Observium.
*
* @package librenms
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
* @package observium
* @subpackage ircbot
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*
*/
poll-billing.php
+6 -7
View File
@@ -2,15 +2,14 @@
<?php
/**
* LibreNMS
* Observium
*
* This file is part of LibreNMS
* This file is part of Observium.
*
* @package librenms
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
* @package observium
* @subpackage billing
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*
*/
poll-device.php
+6 -7
View File
@@ -2,15 +2,14 @@
<?php
/**
* LibreNMS
* Observium
*
* This file is part of LibreNMS
* This file is part of Observium.
*
* @package librenms
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
* @package observium
* @subpackage poller
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*
*/
poller.php
+6 -7
View File
@@ -2,15 +2,14 @@
<?php
/**
* LibreNMS
* Observium
*
* This file is part of LibreNMS
* This file is part of Observium.
*
* @package librenms
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
* @package observium
* @subpackage poller
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*
*/
renamehost.php
+5 -6
View File
@@ -2,15 +2,14 @@
<?php
/**
* LibreNMS
* Observium
*
* This file is part of LibreNMS
* This file is part of Observium.
*
* @package librenms
* @package observium
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*
*/
snmptrap.php
+6 -7
View File
@@ -2,15 +2,14 @@
<?php
/**
* LibreNMS
* Observium
*
* This file is part of LibreNMS
* This file is part of Observium.
*
* @package librenms
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
* @package observium
* @subpackage snmptraps
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*
*/
syslog.php
+6 -7
View File
@@ -2,15 +2,14 @@
<?php
/**
* LibreNMS
* Observium
*
* This file is part of LibreNMS
* This file is part of Observium.
*
* @package librenms
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
* @package observium
* @subpackage syslog
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*
*/