From 61ff7475a816a0eb821df74b8375fef65b115565 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Fri, 22 Jan 2016 09:56:50 -0800 Subject: [PATCH] Add a stray dependency that was missing due to godep update --- Godeps/LICENSES.md | 5 +++-- .../src/github.com/stretchr/testify/LICENCE.txt | 9 +++++++++ hack/update-godep-licenses.sh | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 Godeps/_workspace/src/github.com/stretchr/testify/LICENCE.txt diff --git a/Godeps/LICENSES.md b/Godeps/LICENSES.md index 04ba00ebe8c..5c9b583f243 100644 --- a/Godeps/LICENSES.md +++ b/Godeps/LICENSES.md @@ -13,7 +13,7 @@ github.com/beorn7/perks/quantile | MIT? github.com/blang/semver | MITname github.com/boltdb/bolt | MITname github.com/bradfitz/http2 | BSDlikeRef -github.com/camlistore/camlistore/pkg/errorutil | Apache-2 +github.com/camlistore/go4 | Apache-2 github.com/ClusterHQ/flocker-go | UNKNOWN github.com/codegangsta/negroni | MITname github.com/coreos/etcd | Apache-2 @@ -29,7 +29,7 @@ github.com/daviddengcn/go-colortext | BSD? github.com/dgrijalva/jwt-go | spdxMIT github.com/docker/docker | Apache-2 github.com/docker/docker/pkg/symlink | spdxBSD3 -github.com/docker/spdystream | Apache-2 +github.com/docker/spdystream | SeeFile github.com/elazarl/go-bindata-assetfs | spdxBSD2 github.com/elazarl/goproxy | BSDWarr github.com/emicklei/go-restful | MITname @@ -81,6 +81,7 @@ github.com/Sirupsen/logrus | MITname github.com/skynetservices/skydns | MITname github.com/spf13/cobra | Apache-2 github.com/spf13/pflag | spdxBSD3 +github.com/ssoroka/ttime | UNKNOWN github.com/stretchr/objx | MIT? github.com/stretchr/testify | MIT? github.com/syndtr/gocapability | spdxBSD2 diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/LICENCE.txt b/Godeps/_workspace/src/github.com/stretchr/testify/LICENCE.txt new file mode 100644 index 00000000000..a009ba467ce --- /dev/null +++ b/Godeps/_workspace/src/github.com/stretchr/testify/LICENCE.txt @@ -0,0 +1,9 @@ +Copyright (c) 2012 - 2013 Mat Ryer and Tyler Bunnell + +Please consider promoting this project if you find it useful. + +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. \ No newline at end of file diff --git a/hack/update-godep-licenses.sh b/hack/update-godep-licenses.sh index 9f9b39857c0..4f0c70bf629 100755 --- a/hack/update-godep-licenses.sh +++ b/hack/update-godep-licenses.sh @@ -41,4 +41,5 @@ exec docker run --rm -i -v "${KUBE_ROOT}:/repo" mesosphere/godep-licenses:latest -e github.com/spf13/cobra:Apache-2 \ -e github.com/stretchr/objx:MIT? \ -e github.com/stretchr/testify:MIT? \ + -e github.com/docker/spdystream:SeeFile \ -o md > Godeps/LICENSES.md