summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorNeil McKee <neil.mckee@inmon.com>2011-12-09 16:56:32 -0800
committerBen Pfaff <blp@nicira.com>2011-12-10 16:00:58 -0800
commit7dd32dffd770a9a3107890836096cfecc9854e01 (patch)
tree5a50be71072b72f4a722055039a811933cff4141 /COPYING
parent7c70698f0134fe1dee756e468a095ddd6366a7d5 (diff)
downloadopenvswitch-7dd32dffd770a9a3107890836096cfecc9854e01.tar.gz
sFlow: add Sun Industry Standards Source License 1.1 as licensing option
The sFlow License was not on the list for the Fedora Project, but the Sun Industry Standards Source License 1.1 was (and it has the right properties). So this patch includes it as a licensing option in the relevant places (COPYING and the lib/sflow* sources). Let me know if this looks OK or not. Signed-off-by: Neil McKee <neil.mckee@inmon.com> Signed-off-by: Ben Pfaff <blp@nicira.com> Acked-by: Chris Wright <chrisw@sous-sol.org>
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING6
1 files changed, 4 insertions, 2 deletions
diff --git a/COPYING b/COPYING
index ad17c7c6e..22c9341b8 100644
--- a/COPYING
+++ b/COPYING
@@ -22,8 +22,10 @@ Public License, version 2.
Files under the xenserver directory are licensed on a file-by-file
basis. Refer to each file for details.
-Files lib/sflow*.[ch] are licensed under the terms of the InMon sFlow
-licence that is available at:
+Files lib/sflow*.[ch] are licensed under the terms of either the
+Sun Industry Standards Source License 1.1, that is available at:
+ http://host-sflow.sourceforge.net/sissl.html
+or the InMon sFlow License, that is available at:
http://www.inmon.com/technology/sflowlicense.txt
Files under python/compat are licensed under the Python Software