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

Merge branch 'master' into devel

Browse Source
This commit is contained in:
Paul Gear
2013-10-29 05:27:34 +10:00
parent 000add781f 3f78fb2629
commit 14f707aa2a
18 changed files with 106 additions and 111 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
+11 -2
View File
@@ -50,7 +50,16 @@ See `INSTALL.md` for details.
Contributing
------------
Clone the repo and file bug reports and pull requests here.
Join the [librenms-project][1] mailing list to post questions and suggestions.
You can participate in the project by:
- Joining the [librenms-project][1] mailing list to post questions and
suggestions.
- Cloning the [repo][2] and filing bug reports and pull requests on github.
- Talking to us on [Twitter][3] or [IRC][4].
- Improving the [wiki][5].
[1]: https://groups.google.com/forum/#!forum/librenms-project "LibreNMS"
[2]: https://github.com/librenms/librenms
[3]: https://twitter.com/librenms
[4]: irc://irc.freenode.net/##librenms
[5]: https://github.com/librenms/librenms/wiki
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
*
*/