updated .gitignore and added comment explaining vendoring patch

pull/39/head
Dan Gillespie 2016-05-04 02:24:07 -07:00
parent fe340e52e7
commit 50aca2eebe
2 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View File

@ -23,5 +23,4 @@ _testmain.go
*.test
*.prof
/minikube
/out

View File

@ -25,6 +25,8 @@ rm -rf Godeps vendor
GO15VENDOREXPERIMENT="1" godep save -v ./...
# apply patch to golang.org/x/net/trace/trace.go
# Comments out init block to prevent a panic caused by trying to register an HTTP
# route which has been registered by a copy of the same packaged vendored by etcd.
patch vendor/golang.org/x/net/trace/trace.go - <<EOF
109a110
> /*