From 63d428c0e1e62edd4be9029322f18a7757718c5c Mon Sep 17 00:00:00 2001 From: Tyler Christiansen Date: Mon, 28 Oct 2013 12:01:36 -0700 Subject: [PATCH] Revert "update copyright notice" after discussion with Paul This reverts commit 774233327e3b300011b7a6fdcbef3a375f34b8b8. --- CHANGELOG | 4 +++- addhost.php | 11 +++++------ adduser.php | 11 +++++------ alerts.php | 13 ++++++------- billing-calculate.php | 13 ++++++------- check-errors.php | 13 ++++++------- check-services.php | 13 ++++++------- delhost.php | 11 +++++------ discovery.php | 13 ++++++------- generate-iplist.php | 13 ++++++------- irc.php | 13 ++++++------- poll-billing.php | 13 ++++++------- poll-device.php | 13 ++++++------- poller.php | 13 ++++++------- renamehost.php | 11 +++++------ snmptrap.php | 13 ++++++------- syslog.php | 13 ++++++------- 17 files changed, 95 insertions(+), 109 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d775e121bd..5bdf8fb18b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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. \ No newline at end of file diff --git a/addhost.php b/addhost.php index 0689d7299a..67b859d2e8 100755 --- a/addhost.php +++ b/addhost.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/adduser.php b/adduser.php index d70ade3e12..18c41d8dd1 100755 --- a/adduser.php +++ b/adduser.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/alerts.php b/alerts.php index 52723fdb72..6886d9ccfc 100755 --- a/alerts.php +++ b/alerts.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @package observium + * @subpackage alerts + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/billing-calculate.php b/billing-calculate.php index 0d09609bd6..d1f21abae7 100755 --- a/billing-calculate.php +++ b/billing-calculate.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @package observium + * @subpackage billing + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/check-errors.php b/check-errors.php index 22052e5819..0a430bfed0 100755 --- a/check-errors.php +++ b/check-errors.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @package observium + * @subpackage alerts + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/check-services.php b/check-services.php index 8c3539ad2e..2f6f33ab6b 100755 --- a/check-services.php +++ b/check-services.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @package observium + * @subpackage services + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/delhost.php b/delhost.php index ee3d2b360e..2c21d01f79 100755 --- a/delhost.php +++ b/delhost.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/discovery.php b/discovery.php index c2aaad204c..4596591451 100755 --- a/discovery.php +++ b/discovery.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @package observium + * @subpackage discovery + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/generate-iplist.php b/generate-iplist.php index 805b9d98c7..a4b324fc3b 100755 --- a/generate-iplist.php +++ b/generate-iplist.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @package observium + * @subpackage discovery + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/irc.php b/irc.php index d1cbe47de5..1b50aa3b7d 100755 --- a/irc.php +++ b/irc.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @package observium + * @subpackage ircbot + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/poll-billing.php b/poll-billing.php index f838e28292..5b70ac552a 100755 --- a/poll-billing.php +++ b/poll-billing.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @package observium + * @subpackage billing + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/poll-device.php b/poll-device.php index 96ea6f2431..6ddda40565 100755 --- a/poll-device.php +++ b/poll-device.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @package observium + * @subpackage poller + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/poller.php b/poller.php index 55b09636d0..91dd17296f 100755 --- a/poller.php +++ b/poller.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @package observium + * @subpackage poller + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/renamehost.php b/renamehost.php index 5d7daa110c..1178be36ae 100755 --- a/renamehost.php +++ b/renamehost.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/snmptrap.php b/snmptrap.php index a7a29877e3..049da4c7c8 100755 --- a/snmptrap.php +++ b/snmptrap.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @package observium + * @subpackage snmptraps + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/syslog.php b/syslog.php index e6736154f5..5ef8c5b10b 100755 --- a/syslog.php +++ b/syslog.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @package observium + * @subpackage syslog + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */