From a485d76f2a40be9affbdfca44d0df4fca959d751 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Wed, 30 Nov 2016 22:04:40 +0000 Subject: [PATCH] vendor: switch to gvt --- build/teamcity-checkdeps.sh | 2 +- glide.lock | 376 ------------------------------------ glide.yaml | 168 ---------------- vendor | 2 +- 4 files changed, 2 insertions(+), 546 deletions(-) delete mode 100644 glide.lock delete mode 100644 glide.yaml diff --git a/build/teamcity-checkdeps.sh b/build/teamcity-checkdeps.sh index b2a393cd6b05..e48838897f47 100755 --- a/build/teamcity-checkdeps.sh +++ b/build/teamcity-checkdeps.sh @@ -5,7 +5,7 @@ set -exuo pipefail echo "checking that 'vendor' matches manifest" rm -rf vendor/*/* -glide install --strip-vcs +gvt restore -connections 8 ! git -C vendor status --porcelain | read || (git -C vendor status; git -C vendor diff -a; exit 1) echo "checking that all deps are in 'vendor''" diff --git a/glide.lock b/glide.lock deleted file mode 100644 index 20d19f269d8b..000000000000 --- a/glide.lock +++ /dev/null @@ -1,376 +0,0 @@ -hash: 25cafe1ddc0e3a1c44003743074780c3bef5ec5dfad764e2085f103a16636f95 -updated: 2016-11-28T19:24:55.079179654Z -imports: -- name: github.com/abourget/teamcity - version: 6dde447fa54bc5b08b1a7bb1b85e39089cf27fb1 -- name: github.com/agtorre/gocolorize - version: f42b554bf7f006936130c9bb4f971afd2d87f671 -- name: github.com/Azure/go-ansiterm - version: fa152c58bc15761d0200cb75fe958b89a9d4888e - subpackages: - - winterm -- name: github.com/backtrace-labs/go-bcd - version: 389d108b62915963d915a02837f0ffc00b759d50 -- name: github.com/biogo/store - version: 913427a1d5e89604e50ea1db0f28f34966d61602 - subpackages: - - interval - - llrb -- name: github.com/cenk/backoff - version: b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3 -- name: github.com/chzyer/readline - version: c914be64f07d9998f52bf0d598ec26d457168c0f -- name: github.com/client9/misspell - version: 9a1fc2456ac9e8c9b4cbe9d005b6e7adac0d357f - subpackages: - - cmd/misspell -- name: github.com/cockroachdb/c-jemalloc - version: 42e6a32cd7a4dff9c70d80323681d46d046181ef -- name: github.com/cockroachdb/c-protobuf - version: 070b64667a22925d971878b61e4f0c1df31e8599 - subpackages: - - cmd/protoc -- name: github.com/cockroachdb/c-rocksdb - version: b5ca031b93fde49bfa2ba99aba423136aebf3c06 -- name: github.com/cockroachdb/c-snappy - version: c0cd3c9ce92f195001595e1fbbe66f045daad34f -- name: github.com/cockroachdb/cmux - version: b64f5908f4945f4b11ed4a0a9d3cc1e23350866d -- name: github.com/cockroachdb/cockroach-go - version: 31611c0501c812f437d4861d87d117053967c955 - subpackages: - - crdb -- name: github.com/cockroachdb/crlfmt - version: f4be2332630e8f33c3262c0d5f0d13d733c8bedf -- name: github.com/cockroachdb/pq - version: 44a6473ebbc26e3af09fe57bbdf761475c2c9f7c -- name: github.com/cockroachdb/stress - version: ce09c414594390d1d6432280c7cac55e62c6b0af -- name: github.com/codahale/hdrhistogram - version: 3a0bb77429bd3a61596f5e8a3172445844342120 -- name: github.com/coreos/etcd - version: c31b1ab8d18ff7990a43bd258ca54f80c5a3c952 - subpackages: - - raft - - raft/raftpb -- name: github.com/cpuguy83/go-md2man - version: a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa - subpackages: - - md2man -- name: github.com/docker/distribution - version: 38fbd03266d86923d963566a6565c3fa01f496d8 - subpackages: - - digest - - reference -- name: github.com/docker/docker - version: 7248742ae7127347a52ab9d215451c213b7b59da - subpackages: - - api/types - - api/types/blkiodev - - api/types/container - - api/types/events - - api/types/filters - - api/types/mount - - api/types/network - - api/types/reference - - api/types/registry - - api/types/strslice - - api/types/swarm - - api/types/time - - api/types/versions - - api/types/volume - - client - - pkg/jsonlog - - pkg/jsonmessage - - pkg/namesgenerator - - pkg/random - - pkg/stdcopy - - pkg/term - - pkg/term/windows - - pkg/tlsconfig -- name: github.com/docker/go-connections - version: 4ccf312bf1d35e5dbda654e57a9be4c3f3cd0366 - subpackages: - - nat - - sockets - - tlsconfig -- name: github.com/docker/go-units - version: 8a7beacffa3009a9ac66bad506b18ffdd110cf97 -- name: github.com/dustin/go-humanize - version: bd88f87ad3a420f7bcf05e90566fd1ceb351fa7f -- name: github.com/elastic/gosigar - version: 77904081ae782b3d34334a142e1d98c4f9d88336 - subpackages: - - sys/windows -- name: github.com/elazarl/go-bindata-assetfs - version: 9a6736ed45b44bf3835afeebb3034b57ed329f3e -- name: github.com/facebookgo/clock - version: 600d898af40aa09a7a93ecb9265d87b0504b6f03 -- name: github.com/go-ole/go-ole - version: 5e9c030faf78847db7aa77e3661b9cc449de29b7 - subpackages: - - oleutil -- name: github.com/gogo/protobuf - version: ccdc7fbcb4cd13f34b76d7262805e58316faaaf4 - subpackages: - - gogoproto - - jsonpb - - plugin/compare - - plugin/defaultcheck - - plugin/description - - plugin/embedcheck - - plugin/enumstringer - - plugin/equal - - plugin/face - - plugin/gostring - - plugin/marshalto - - plugin/oneofcheck - - plugin/populate - - plugin/size - - plugin/stringer - - plugin/testgen - - plugin/union - - plugin/unmarshal - - proto - - protoc-gen-gogo/descriptor - - protoc-gen-gogo/generator - - protoc-gen-gogo/grpc - - protoc-gen-gogo/plugin - - sortkeys - - types - - vanity - - vanity/command -- name: github.com/golang/glog - version: 23def4e6c14b4da8ac2ed8007337bc5eb5007998 -- name: github.com/golang/lint - version: 206c0f020eba0f7fbcfbc467a5eb808037df2ed6 - subpackages: - - golint -- name: github.com/golang/protobuf - version: 4bd1920723d7b7c925de087aa32e2187708897f7 - subpackages: - - jsonpb - - proto - - protoc-gen-go/descriptor - - ptypes/timestamp -- name: github.com/google/btree - version: 925471ac9e2131377a91e1595defec898166fe49 -- name: github.com/google/go-github - version: d4f1b2d029be1730fd349ca929cc9c0da4a27007 - subpackages: - - github -- name: github.com/google/go-querystring - version: 9235644dd9e52eeae6fa48efd539fdc351a0af53 - subpackages: - - query -- name: github.com/grpc-ecosystem/grpc-gateway - version: 84398b94e188ee336f307779b57b3aa91af7063c - subpackages: - - protoc-gen-grpc-gateway - - runtime - - runtime/internal - - third_party/googleapis/google/api - - utilities -- name: github.com/inconshreveable/mousetrap - version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 -- name: github.com/jeffjen/datefmt - version: 6688647cfa0439b86e09b097cac96ed328d5fa34 -- name: github.com/jteeuwen/go-bindata - version: a0ff2567cfb70903282db057e799fd826784d41d - subpackages: - - go-bindata -- name: github.com/kisielk/errcheck - version: db0ca22445717d1b2c51ac1034440e0a2a2de645 -- name: github.com/kisielk/gotool - version: 5e136deb9b893bbe6c8f23236ff4378b7a8a0dbb -- name: github.com/kkaneda/returncheck - version: bf081fa7155e3a27df1f056a49d50685edfa5b1b -- name: github.com/kr/pretty - version: cfb55aafdaf3ec08f0db22699ab822c50091b1c4 -- name: github.com/kr/text - version: 7cafcd837844e784b526369c9bce262804aebc60 -- name: github.com/leekchan/timeutil - version: 28917288c48df3d2c1cfe468c273e0b2adda0aa5 -- name: github.com/lib/pq - version: d8eeeb8bae8896dd8e1b7e514ab0d396c4f12a1b - subpackages: - - oid -- name: github.com/lightstep/lightstep-tracer-go - version: b1bc6c278e9a007584bbc0b9139e776b4e3203e3 - subpackages: - - collectorpb - - lightstep_thrift - - thrift_0_9_2/lib/go/thrift - - thrift_rpc -- name: github.com/mattn/go-isatty - version: 30a891c33c7cde7b02a981314b4228ec99380cca -- name: github.com/mattn/go-runewidth - version: 737072b4e32b7a5018b4a7125da8d12de90e8045 -- name: github.com/mattn/goveralls - version: a63d65fe590e2c830e60ad260cde6755ce3482a5 -- name: github.com/matttproud/golang_protobuf_extensions - version: c12348ce28de40eed0136aa2b644d0ee0650e56c - subpackages: - - pbutil -- name: github.com/mdempsky/unconvert - version: beb68d938016d2dec1d1b078054f4d3db25f97be -- name: github.com/mibk/dupl - version: f008fcf5e62793d38bda510ee37aab8b0c68e76c -- name: github.com/Microsoft/go-winio - version: 24a3e3d3fc7451805e09d11e11e95d9a0a4f205e -- name: github.com/montanaflynn/stats - version: f8cd06f93c6c1b06028caafb88b540fc820f77c1 -- name: github.com/olekukonko/tablewriter - version: bdcc175572fd7abece6c831e643891b9331bc9e7 -- name: github.com/opencontainers/runc - version: f156f73c2aab1b735df23c9323c976ad5dca1d78 - subpackages: - - libcontainer/user -- name: github.com/opentracing/basictracer-go - version: 1b32af207119a14b1b231d451df3ed04a72efebf - subpackages: - - wire -- name: github.com/opentracing/opentracing-go - version: 902ca977fd85455c364050f985eba376b44315f0 - subpackages: - - ext - - log -- name: github.com/pborman/uuid - version: 3d4f2ba23642d3cfd06bd4b54cf03d99d95c0f1b -- name: github.com/petermattis/goid - version: ba001f8780f3bf978180f390ad7b5bac39fbf70a -- name: github.com/pkg/errors - version: 248dadf4e9068a0b3e79f02ed0a610d935de5302 -- name: github.com/prometheus/client_model - version: fa8ad6fec33561be4280a8f0514318c79d7f6cb6 - subpackages: - - go -- name: github.com/prometheus/common - version: 0d5de9d6d8629cb8bee6d4674da4127cd8b615a3 - subpackages: - - expfmt - - internal/bitbucket.org/ww/goautoneg - - model -- name: github.com/rcrowley/go-metrics - version: ab2277b1c5d15c3cba104e9cbddbdfc622df5ad8 - subpackages: - - exp -- name: github.com/robfig/glock - version: 4222fa46a09f9ac1e2fc20bd1053e1e866d0a01f -- name: github.com/rubyist/circuitbreaker - version: af9583088c3453556f6e4f580693ba8606ca459a -- name: github.com/russross/blackfriday - version: 5f33e7b7878355cd2b7e6b8eefc48a5472c69f70 -- name: github.com/sasha-s/go-deadlock - version: 09aefc0ac06ad74d91ca31acdb11fc981c159149 -- name: github.com/satori/go.uuid - version: b061729afc07e77a8aa4fad0a2fd840958f1942a -- name: github.com/shurcooL/sanitized_anchor_name - version: 1dba4b3954bc059efc3991ec364f9f9a35f597d2 -- name: github.com/Sirupsen/logrus - version: 55eb11d21d2a31a3cc93838241d04800f52e823d - subpackages: - - formatters/logstash -- name: github.com/spf13/cobra - version: 9495bc009a56819bdb0ddbc1a373e29c140bc674 - subpackages: - - doc -- name: github.com/spf13/pflag - version: 5ccb023bc27df288a957c5e994cd44fd19619465 -- name: github.com/StackExchange/wmi - version: e54cbda6595d7293a7a468ccf9525f6bc8887f99 -- name: github.com/tebeka/go2xunit - version: aaee8a42931ce35b4821d9c7cd68f73de70cba3d - subpackages: - - lib -- name: github.com/VividCortex/ewma - version: c595cd886c223c6c28fc9ae2727a61b5e4693d85 -- name: github.com/wadey/gocovmerge - version: b5bfa59ec0adc420475f97f89b58045c721d761c -- name: golang.org/x/crypto - version: 1351f936d976c60a0a48d728281922cf63eafb8d - subpackages: - - bcrypt - - blowfish - - ssh/terminal -- name: golang.org/x/net - version: 6acef71eb69611914f7a30939ea9f6e194c78172 - subpackages: - - context - - context/ctxhttp - - http2 - - http2/hpack - - internal/timeseries - - proxy - - trace -- name: golang.org/x/oauth2 - version: d5040cddfc0da40b408c9a1da4728662435176a9 - subpackages: - - internal -- name: golang.org/x/sys - version: 30237cf4eefd639b184d1f2cb77a581ea0be8947 - subpackages: - - unix - - windows -- name: golang.org/x/text - version: b01949dc0793a9af5e4cb3fce4d42999e76e8ca1 - subpackages: - - collate - - internal/colltab - - internal/tag - - language - - transform - - unicode/norm -- name: golang.org/x/tools - version: ebf631f91765900b0af5a2010d1ee5e471db6b49 - subpackages: - - cmd/goimports - - cmd/goyacc - - cmd/stringer - - go/ast/astutil - - go/buildutil - - go/loader - - go/ssa - - go/types/typeutil -- name: google.golang.org/appengine - version: 12d5545dc1cfa6047a286d5e853841b6471f4c19 - subpackages: - - internal - - internal/base - - internal/datastore - - internal/log - - internal/remote_api - - internal/urlfetch - - urlfetch -- name: google.golang.org/grpc - version: 79b7c349179cdd6efd8bac4a1ce7f01b98c16e9b - subpackages: - - codes - - credentials - - grpclog - - internal - - metadata - - naming - - peer - - transport -- name: gopkg.in/inf.v0 - version: 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 -- name: gopkg.in/yaml.v2 - version: a5b47d31c556af34a302ce5d659e6fea44d90de0 -- name: honnef.co/go/lint - version: b93edc3f49e7fac49e833136d261c0a15125178e - subpackages: - - lintutil -- name: honnef.co/go/simple - version: 5bf56c237b9660d8476ebd0e9ff14e6f06215a7d -- name: honnef.co/go/staticcheck - version: 1808e1b5cd4acae8f67421110d05222214cebe4d -- name: honnef.co/go/unused - version: bc7f902391ead3f59bf5ab82ddf3c7d489837b62 -testImports: -- name: github.com/ghemawat/stream - version: 78e682abcae4f96ac7ddbe39912967a5f7cbbaa6 -- name: github.com/go-sql-driver/mysql - version: 665b83488b90b902ce0a305ef6652e599771cdf9 -- name: github.com/termie/go-shutil - version: bcacb06fecaeec8dc42af03c87c6949f4a05c74c diff --git a/glide.yaml b/glide.yaml deleted file mode 100644 index a988b96849ad..000000000000 --- a/glide.yaml +++ /dev/null @@ -1,168 +0,0 @@ -package: github.com/cockroachdb/cockroach -import: -- package: github.com/VividCortex/ewma -- package: github.com/abourget/teamcity -- package: github.com/backtrace-labs/go-bcd -- package: github.com/biogo/store - subpackages: - - interval - - llrb -- package: github.com/cenk/backoff -- package: github.com/chzyer/readline -- package: github.com/cockroachdb/c-jemalloc - version: 42e6a32cd7a4dff9c70d80323681d46d046181ef -- package: github.com/cockroachdb/c-protobuf - subpackages: - - cmd/protoc -- package: github.com/cockroachdb/c-rocksdb - version: b5ca031b93fde49bfa2ba99aba423136aebf3c06 -- package: github.com/cockroachdb/cmux -- package: github.com/cockroachdb/cockroach-go - subpackages: - - crdb -- package: github.com/cockroachdb/pq -- package: github.com/codahale/hdrhistogram -- package: github.com/coreos/etcd - subpackages: - - raft - - raft/raftpb -- package: github.com/docker/docker - version: 7248742ae7127347a52ab9d215451c213b7b59da - subpackages: - - api/types - - api/types/container - - api/types/events - - api/types/filters - - api/types/network - - client - - pkg/jsonmessage - - pkg/stdcopy -- package: github.com/docker/go-connections - subpackages: - - nat -- package: github.com/dustin/go-humanize -- package: github.com/elastic/gosigar -- package: github.com/elazarl/go-bindata-assetfs -- package: github.com/facebookgo/clock -- package: github.com/gogo/protobuf - version: ccdc7fbcb4cd13f34b76d7262805e58316faaaf4 - subpackages: - - jsonpb - - proto - - protoc-gen-gogo/descriptor - - sortkeys - - vanity - - vanity/command -- package: github.com/golang/protobuf - subpackages: - - proto -- package: github.com/google/btree -- package: github.com/google/go-github - subpackages: - - github -- package: github.com/grpc-ecosystem/grpc-gateway - subpackages: - - runtime - - third_party/googleapis/google/api - - utilities - - protoc-gen-grpc-gateway -- package: github.com/jeffjen/datefmt -- package: github.com/kisielk/gotool -- package: github.com/kr/pretty -- package: github.com/kr/text -- package: github.com/leekchan/timeutil -- package: github.com/lib/pq - subpackages: - - oid -- package: github.com/lightstep/lightstep-tracer-go -- package: github.com/mattn/go-isatty -- package: github.com/montanaflynn/stats -- package: github.com/olekukonko/tablewriter -- package: github.com/opentracing/basictracer-go -- package: github.com/opentracing/opentracing-go - subpackages: - - ext - - log -- package: github.com/petermattis/goid -- package: github.com/pkg/errors -- package: github.com/prometheus/client_model - subpackages: - - go -- package: github.com/prometheus/common - subpackages: - - expfmt -- package: github.com/rcrowley/go-metrics - subpackages: - - exp -- package: github.com/rubyist/circuitbreaker -- package: github.com/sasha-s/go-deadlock -- package: github.com/satori/go.uuid -- package: github.com/spf13/cobra - subpackages: - - doc -- package: github.com/spf13/pflag -- package: github.com/tebeka/go2xunit - subpackages: - - lib -- package: golang.org/x/crypto - subpackages: - - bcrypt - - ssh/terminal -- package: golang.org/x/net - subpackages: - - context - - http2 - - trace -- package: golang.org/x/oauth2 -- package: golang.org/x/text - subpackages: - - collate - - language - - unicode/norm -- package: google.golang.org/grpc - version: 79b7c349179cdd6efd8bac4a1ce7f01b98c16e9b - subpackages: - - codes - - credentials - - grpclog - - peer - - transport -- package: gopkg.in/inf.v0 -- package: gopkg.in/yaml.v2 -- package: honnef.co/go/lint - subpackages: - - lintutil -- package: honnef.co/go/simple -- package: honnef.co/go/staticcheck -- package: honnef.co/go/unused -- package: github.com/jteeuwen/go-bindata - subpackages: - - go-bindata -- package: github.com/mattn/goveralls -- package: github.com/client9/misspell - subpackages: - - cmd/misspell -- package: github.com/cockroachdb/crlfmt -- package: github.com/cockroachdb/stress -- package: github.com/golang/lint - subpackages: - - golint -- package: github.com/kisielk/errcheck -- package: github.com/kkaneda/returncheck -- package: github.com/mdempsky/unconvert -- package: github.com/mibk/dupl -- package: github.com/robfig/glock -- package: github.com/wadey/gocovmerge -- package: golang.org/x/tools - subpackages: - - go/buildutil - - cmd/goimports - - cmd/goyacc - - cmd/stringer -- package: github.com/golang/glog -- package: github.com/pborman/uuid -- package: github.com/agtorre/gocolorize -testImport: -- package: github.com/ghemawat/stream -- package: github.com/go-sql-driver/mysql -- package: github.com/termie/go-shutil diff --git a/vendor b/vendor index cc7695daa13f..ab8b3274eedf 160000 --- a/vendor +++ b/vendor @@ -1 +1 @@ -Subproject commit cc7695daa13fe2defea99f17d7ad3f0e20c271f0 +Subproject commit ab8b3274eedfe6c3b1e8fb3df4566af83dee0f6f