You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by oc...@apache.org on 2021/03/09 02:46:09 UTC
[trafficcontrol] branch master updated: More LICENSE file cleanup
(#5612)
This is an automated email from the ASF dual-hosted git repository.
ocket8888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 8db222c More LICENSE file cleanup (#5612)
8db222c is described below
commit 8db222c0d2860ddf4504bcbd96bc5a2d0210c86c
Author: Zach Hoffman <zr...@apache.org>
AuthorDate: Mon Mar 8 19:45:58 2021 -0700
More LICENSE file cleanup (#5612)
* github.com/lib/pq is available under an MIT license, not a BSD-3-Clause
license
* gopkg.in/square/go-jose.v2/json is available under a BSD-3-Clause
license, not an Apache-2.0 license
* Change wording for the fakeOrigin example video
---
LICENSE | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/LICENSE b/LICENSE
index fa9d85b..380e501 100644
--- a/LICENSE
+++ b/LICENSE
@@ -341,7 +341,7 @@ This product bundles yaml, which is available under an Apache-2.0 license.
./vendor/gopkg.in/yaml.v2/LICENSE.libyaml
Refer to the above license for the full text.
-This product bundles pq, which is available under a BSD-3-Clause license.
+This product bundles pq, which is available under an MIT license.
@vendor/github.com/lib/pq/*
./vendor/github.com/lib/pq/LICENSE.md
Refer to the above license for the full text.
@@ -467,7 +467,7 @@ This product bundles ldap.v2 component, which is available under an MIT license.
./vendor/gopkg.in/ldap.v2/LICENSE
Refer to the above license for the full text.
-This product bundles fakeOrigin example video, which is available under an CC-PDM-1.0 license.
+This product bundles an example video for fakeOrigin, which is available under an CC-PDM-1.0 license.
@test/fakeOrigin/example/video/*
./test/fakeOrigin/example/video/LICENSE
Refer to the above license for the full text.
@@ -547,7 +547,7 @@ This product bundles pborman/getopt/v2, which is available under a BSD-3-Clause
vendor/github.com/pborman/getopt/v2/LICENSE
Refer to the above license for the full text.
-This product bundles gopkg.in/square/go-jose.v2/json, which is available under an Apache-2.0 license.
+This product bundles gopkg.in/square/go-jose.v2/json, which is available under a BSD-3-Clause license.
@vendor/gopkg.in/square/go-jose.v2/json/*
@vendor/gopkg.in/square/go-jose.v2/json/LICENSE
Refer to the above license for the full text.