X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=COPYING;h=8d1bc9d5137390b27bca8ae16b437ab5847e7a6a;hb=refs%2Fheads%2Fbranch-1.1;hp=39dd45c674702fa451febef910b2c17a724ea435;hpb=5f55c39b21e69025045437ffbd3bb98fe6ce2e89;p=sliver-openvswitch.git

diff --git a/COPYING b/COPYING
index 39dd45c67..8d1bc9d51 100644
--- a/COPYING
+++ b/COPYING
@@ -20,32 +20,7 @@ Files under the datapath directory are licensed under the GNU General
 Public License, version 2.
 
 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.
+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: