summaryrefslogtreecommitdiffstats
path: root/lib/subunit/COPYING
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2014-12-14 20:28:25 +0000
committerAndrew Bartlett <abartlet@samba.org>2015-03-06 04:41:48 +0100
commitda04eb9c3aced4ec62c6cda54061a303d608c016 (patch)
tree5c98e4a5214a0c889990c6ee64d857e83b4626da /lib/subunit/COPYING
parente59f2602f1f89f9d2a9b15a614ab0d86da5adc4e (diff)
downloadsamba-da04eb9c3aced4ec62c6cda54061a303d608c016.tar.gz
samba-da04eb9c3aced4ec62c6cda54061a303d608c016.tar.xz
samba-da04eb9c3aced4ec62c6cda54061a303d608c016.zip
Remove bundled subunit.
Change-Id: I18e19c3817de6f97fe2a9fb1b7faa4f8a0d27649 Signed-off-by: Jelmer Vernooij <jelmer@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'lib/subunit/COPYING')
-rw-r--r--lib/subunit/COPYING36
1 files changed, 0 insertions, 36 deletions
diff --git a/lib/subunit/COPYING b/lib/subunit/COPYING
deleted file mode 100644
index 3ba50f8e08..0000000000
--- a/lib/subunit/COPYING
+++ /dev/null
@@ -1,36 +0,0 @@
-Subunit is licensed under two licenses, the Apache License, Version 2.0 or the
-3-clause BSD License. You may use this project under either of these licenses
-- choose the one that works best for you.
-
-We require contributions to be licensed under both licenses. The primary
-difference between them is that the Apache license takes care of potential
-issues with Patents and other intellectual property concerns. This is
-important to Subunit as Subunit wants to be license compatible in a very
-broad manner to allow reuse and incorporation into other projects.
-
-Generally every source file in Subunit needs a license grant under both these
-licenses. As the code is shipped as a single unit, a brief form is used:
-----
-Copyright (c) [yyyy][,yyyy]* [name or 'Subunit Contributors']
-
-Licensed under either the Apache License, Version 2.0 or the BSD 3-clause
-license at the users choice. A copy of both licenses are available in the
-project source as Apache-2.0 and BSD. You may not use this file except in
-compliance with one of these two licences.
-
-Unless required by applicable law or agreed to in writing, software
-distributed under these licenses is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-license you chose for the specific language governing permissions and
-limitations under that license.
-----
-
-Code that has been incorporated into Subunit from other projects will
-naturally be under its own license, and will retain that license.
-
-A known list of such code is maintained here:
-* The python/iso8601 module by Michael Twomey, distributed under an MIT style
- licence - see python/iso8601/LICENSE for details.
-* The runtests.py and python/subunit/tests/TestUtil.py module are GPL test
- support modules. There are not installed by Subunit - they are only ever
- used on the build machine. Copyright 2004 Canonical Limited.