summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2010-08-21 15:39:27 -0700
committerBen Pfaff <blp@nicira.com>2010-08-25 14:55:48 -0700
commit1900fc2c706f6ce204d0710532daaee99ccc5f0c (patch)
tree3e15721d14adb5cb82b36dc729fffd171b88a363 /COPYING
parent991559357f6a03c3a5b70c053c8c2554aa8d5ee4 (diff)
downloadopenvswitch-1900fc2c706f6ce204d0710532daaee99ccc5f0c.tar.gz
Delete local copy of simplejson.
The previous commit dropped usage of simplejson from the Python code in the tree, because it did not provide adequate features to support the JSON-RPC engine. In particular simplejson is not a "push parser"--you can't give it a byte or a character at a time and have it tell you when it has read a whole JSON value.
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING24
1 files changed, 0 insertions, 24 deletions
diff --git a/COPYING b/COPYING
index 39dd45c67..375efecae 100644
--- a/COPYING
+++ b/COPYING
@@ -23,30 +23,6 @@ Files under the xenserver directory are licensed on a file-by-file
basis. Some files are under an uncertain license that may not be
DFSG-compliant or GPL-compatible. Refer to each file for details.
-The files under ovsdb/simplejson are covered by the following license:
-
- Copyright (c) 2006 Bob Ippolito
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use, copy,
- modify, merge, publish, distribute, sublicense, and/or sell copies
- of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
Files lib/sflow*.[ch] are licensed under the terms of the InMon sFlow
licence that is available at:
http://www.inmon.com/technology/sflowlicense.txt