Skip to content

Commit

Permalink
Move third-party licenses to NOTICE
Browse files Browse the repository at this point in the history
  • Loading branch information
axw committed Jan 17, 2019
1 parent 58ee428 commit ddd70a3
Show file tree
Hide file tree
Showing 9 changed files with 291 additions and 267 deletions.
286 changes: 286 additions & 0 deletions NOTICE

Large diffs are not rendered by default.

27 changes: 0 additions & 27 deletions module/apmgorilla/LICENSE.gorillamux.txt

This file was deleted.

4 changes: 2 additions & 2 deletions module/apmgorilla/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ func massageTemplate(tpl string) string {
return buf.String()
}

// Copied/adapted from gorilla/mux. The original version checks
// that the braces are matched up correctly; we assume they are,
// Copied/adapted from gorilla/mux (see NOTICE). The original version
// checks that the braces are matched up correctly; we assume they are,
// as otherwise the path wouldn't have been registered correctly.
func braceIndices(s string) []int {
var level, idx int
Expand Down
201 changes: 0 additions & 201 deletions module/apmot/internal/harness/LICENSE

This file was deleted.

2 changes: 1 addition & 1 deletion module/apmot/internal/harness/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
This is copied from github.com/opentracing/opentracing-go,
as the harness package is not part of the most recent
release of opentracing-go at the time of writing.
release of opentracing-go at the time of writing. See NOTICE.
27 changes: 0 additions & 27 deletions module/apmsql/LICENSE.go.txt

This file was deleted.

7 changes: 0 additions & 7 deletions module/apmsql/pq/LICENSE.pq.txt

This file was deleted.

2 changes: 1 addition & 1 deletion module/apmsql/pq/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func ParseDSN(name string) apmsql.DSNInfo {
return info
}

// Code below is copied from github.com/lib/pq. See README.pq.txt.
// Code below is copied from github.com/lib/pq (see NOTICE).

// parseURL no longer needs to be used by clients of this library since supplying a URL as a
// connection string to sql.Open() is now supported:
Expand Down
2 changes: 1 addition & 1 deletion module/apmsql/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"errors"
)

// namedValueToValue copied from database/sql, see LICENSE.go.txt.
// namedValueToValue copied from database/sql (see NOTICE).
func namedValueToValue(named []driver.NamedValue) ([]driver.Value, error) {
dargs := make([]driver.Value, len(named))
for n, param := range named {
Expand Down

0 comments on commit ddd70a3

Please sign in to comment.