summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES3
-rw-r--r--pysnmp/carrier/twisted/base.py3
-rw-r--r--pysnmp/carrier/twisted/dispatch.py5
3 files changed, 6 insertions, 5 deletions
diff --git a/CHANGES b/CHANGES
index ab32477..0075a22 100644
--- a/CHANGES
+++ b/CHANGES
@@ -68,6 +68,9 @@ Revision 4.2.6rc0
unique PDU request-id's in both outgoing and incoming confirmed
and response PDU types. Duplicate request-id's in unrelated PDUs may
cause cache errors otherwise.
+- Fix to licensing terms of multiple twisted backend modules to make
+ the whole pysnmp package licensed under BSD 2-Clause license. This
+ change has been explicitly permitted by the original modules authors.
Revision 4.2.5
--------------
diff --git a/pysnmp/carrier/twisted/base.py b/pysnmp/carrier/twisted/base.py
index 12bd9ee..c0afeaa 100644
--- a/pysnmp/carrier/twisted/base.py
+++ b/pysnmp/carrier/twisted/base.py
@@ -3,8 +3,7 @@
# Author: Filippo Giunchedi <filippo@truelite.it>
#
# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License Version 2
-# as published by the Free Software Foundation
+# it under the terms of the BSD 2-Clause License as shipped with pysnmp.
#
# Description: twisted DatagramProtocol UDP transport
#
diff --git a/pysnmp/carrier/twisted/dispatch.py b/pysnmp/carrier/twisted/dispatch.py
index ed1affb..9028484 100644
--- a/pysnmp/carrier/twisted/dispatch.py
+++ b/pysnmp/carrier/twisted/dispatch.py
@@ -3,10 +3,9 @@
# Author: Filippo Giunchedi <filippo@truelite.it>
#
# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License Version 2
-# as published by the Free Software Foundation
+# it under the terms of the BSD 2-Clause License as shipped with pysnmp.
#
-# Description: Transport dispatcher based on twisted.internet.reactor
+# Description: Transport dispatcher based on twisted.internet.reactor
#
import sys, time, traceback
from twisted.internet import reactor, task