You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@trafficcontrol.apache.org by GitBox <gi...@apache.org> on 2018/04/04 14:56:24 UTC
[GitHub] limited closed pull request #2082: Fix extra license headings for removed x libs
limited closed pull request #2082: Fix extra license headings for removed x libs
URL: https://github.com/apache/incubator-trafficcontrol/pull/2082
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/LICENSE b/LICENSE
index 6079c0c81..a1b85dbb0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -334,12 +334,6 @@ For the errors component:
@traffic_stats/vendor/github.com/pkg/errors/*
./traffic_stats/vendor/github.com/pkg/errors/LICENSE
-For the x/net component:
-@traffic_stats/vendor/golang.org/x/net/*
-@traffic_ops/testing/compare/vendor/golang.org/x/net/*
-./traffic_stats/vendor/golang.org/x/net/LICENSE
-./traffic_stats/vendor/golang.org/x/net/PATENTS
-
For the MaxMind DB GeoLite2 Database:
@traffic_router/core/src/test/resources/geo/GeoLite2-City.mmdb.gz
./licenses/CC_A_SA_4-maxmind
@@ -408,16 +402,6 @@ The riak-go-client component is used under the Apache license:
@traffic_ops/traffic_ops_golang/vendor/github.com/basho/riak-go-client/*
./traffic_ops/traffic_ops_golang/vendor/github.com/basho/riak-go-client/LICENSE
-The x/crypto library is used under the BSD License from the Go Authors:
-@traffic_ops/traffic_ops_golang/vendor/golang.org/x/crypto/*
-@traffic_ops/testing/api/vendor/golang.org/x/crypto/*
-./traffic_ops/traffic_ops_golang/vendor/golang.org/x/crypto/LICENSE
-./traffic_ops/traffic_ops_golang/vendor/golang.org/x/crypto/PATENTS
-
-The x/net library is used under the BSD License from the Go Authors:
-@traffic_ops/testing/api/vendor/golang.org/x/net/*
-./traffic_ops/testing/api/vendor/golang.org/x/net/LICENSE
-
The envconfig component is used under the MIT license:
@traffic_ops/testing/api/vendor/github.com/kelseyhightower/envconfig/*
@traffic_ops/testing/compare/vendor/github.com/kelseyhightower/envconfig/*
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services