Skip to content

Commit

Permalink
GLOCKFILE: update dependencies
Browse files Browse the repository at this point in the history 
Summary of not-definitely-irrelevant changes:
- github.com/cenkalti/backoff:
  - moved from github.com/cenk/backoff: cenkalti/backoff@b02f2bb
- github.com/cockroachdb/c-protobuf:
  - updated upstream to 3.1.0: cockroachdb/c-protobuf#20
- github.com/gogo/protobuf:
  - rename generated variables data->dAtA: gogo/protobuf#215
- github.com/etcd/raft:
  - PreVote-related panic fix: etcd-io/etcd#6749
- github.com/lib/pq:
  - data race fix: lib/pq@473284b

Not reviewed in detail:
- github.com/go-sql-driver/mysql
- github.com/google/go-github
- golang.org/x/crypto
- golang.org/x/net
- golang.org/x/oauth2
- golang.org/x/sys
- golang.org/x/text
- golang.org/x/tools
- google.golang.org/appengine

Skipped:

- github.com/cockroachdb/c-rocksdb (#9616)
- github.com/docker/docker (moby/moby#27912) breaks all dependents
- google.golang.org/grpc (#9697)
  • Loading branch information
@tamird
tamird committed Nov 4, 2016
1 parent cf89380 commit 1d59f01
Show file tree
Hide file tree
Showing 49 changed files with 9,540 additions and 9,966 deletions.
58 changes: 29 additions & 29 deletions GLOCKFILE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,19 @@ cmd honnef.co/go/simple/cmd/gosimple
cmd honnef.co/go/staticcheck/cmd/staticcheck
cmd honnef.co/go/unused/cmd/unused
github.com/Azure/go-ansiterm fa152c58bc15761d0200cb75fe958b89a9d4888e
github.com/Microsoft/go-winio ce2922f643c8fd76b46cadc7f404a06282678b34
github.com/Sirupsen/logrus 3ec0642a7fb6488f65b06f9040adc67e3990296a
github.com/Microsoft/go-winio 562bb09f6612d9a4e91597184709d1cdba95af93
github.com/Sirupsen/logrus d26492970760ca5d33129d2d799e34be5c4782eb
github.com/StackExchange/wmi e54cbda6595d7293a7a468ccf9525f6bc8887f99
github.com/VividCortex/ewma c595cd886c223c6c28fc9ae2727a61b5e4693d85
github.com/abourget/teamcity 6dde447fa54bc5b08b1a7bb1b85e39089cf27fb1
github.com/agtorre/gocolorize f42b554bf7f006936130c9bb4f971afd2d87f671
github.com/backtrace-labs/go-bcd 389d108b62915963d915a02837f0ffc00b759d50
github.com/biogo/store 913427a1d5e89604e50ea1db0f28f34966d61602
github.com/cenk/backoff 8edc80b07f38c27352fb186d971c628a6c32552b
github.com/cenk/backoff b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3
github.com/chzyer/readline 25c2772d5fd908077927228597b084a1f1a0e66d
github.com/client9/misspell 9a1fc2456ac9e8c9b4cbe9d005b6e7adac0d357f
github.com/cockroachdb/c-jemalloc 42e6a32cd7a4dff9c70d80323681d46d046181ef
github.com/cockroachdb/c-protobuf 951f3e665896e7ba939fd1f2db9aeaae6ca988f8
github.com/cockroachdb/c-protobuf 070b64667a22925d971878b61e4f0c1df31e8599
github.com/cockroachdb/c-rocksdb b5ca031b93fde49bfa2ba99aba423136aebf3c06
github.com/cockroachdb/c-snappy d4e7b428fe7fc09e93573df3448567a62df8c9fa
github.com/cockroachdb/cmux b64f5908f4945f4b11ed4a0a9d3cc1e23350866d
Expand All @@ -46,28 +46,28 @@ github.com/cockroachdb/crlfmt f4be2332630e8f33c3262c0d5f0d13d733c8bedf
github.com/cockroachdb/pq 44a6473ebbc26e3af09fe57bbdf761475c2c9f7c
github.com/cockroachdb/stress 029c9348806514969d1109a6ae36e521af411ca7
github.com/codahale/hdrhistogram 3a0bb77429bd3a61596f5e8a3172445844342120
github.com/coreos/etcd 99539ff031fd2e9c590401d5943a595d191552f1
github.com/coreos/etcd 27459425faab1a28ac4d0063eebcea6e91c18339
github.com/cpuguy83/go-md2man a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa
github.com/docker/distribution d0cdc4802b80609f3064f43e680d8968daa06f2e
github.com/docker/docker cd0e399e062b45bb0c5e11c7eb4de933b1ad0564
github.com/docker/go-connections 988efe982fdecb46f01d53465878ff1f2ff411ce
github.com/docker/go-units f2145db703495b2e525c59662db69a7344b00bb8
github.com/docker/distribution fbe6e8d212ed880cf7f7c9f876ba9b15c8221c5f
github.com/docker/docker 7248742ae7127347a52ab9d215451c213b7b59da
github.com/docker/go-connections f512407a188ecb16f31a33dbc9c4e4814afc1b03
github.com/docker/go-units 8a7beacffa3009a9ac66bad506b18ffdd110cf97
github.com/dustin/go-humanize bd88f87ad3a420f7bcf05e90566fd1ceb351fa7f
github.com/elastic/gosigar 15322f7ed81bc3cfedb66b6716fd272ce042e9db
github.com/elastic/gosigar 77904081ae782b3d34334a142e1d98c4f9d88336
github.com/elazarl/go-bindata-assetfs 9a6736ed45b44bf3835afeebb3034b57ed329f3e
github.com/facebookgo/clock 600d898af40aa09a7a93ecb9265d87b0504b6f03
github.com/ghemawat/stream 78e682abcae4f96ac7ddbe39912967a5f7cbbaa6
github.com/go-ole/go-ole 7dfdcf409020452e29b4babcbb22f984d2aa308a
github.com/go-sql-driver/mysql 0b58b37b664c21f3010e836f1b931e1d0b0b0685
github.com/gogo/protobuf 50d1bd39ce4e7a96b75e3e040be9caf79dbb4c61
github.com/go-sql-driver/mysql ce924a41eea897745442daaa1739089b0f3f561d
github.com/gogo/protobuf a9cd0c35b97daf74d0ebf3514c5254814b2703b4
github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998
github.com/golang/lint 3390df4df2787994aea98de825b964ac7944b817
github.com/golang/protobuf 98fa357170587e470c5f27d3c3ea0947b71eb455
github.com/golang/protobuf 2bc9827a78f95c6665b5fe0abd1fd66b496ae2d8
github.com/google/btree 925471ac9e2131377a91e1595defec898166fe49
github.com/google/go-github 3e246d29992beb5a5d2fc253adebea86997c45b0
github.com/google/go-github 54943985871d3b59053804af48b8347a3c232938
github.com/google/go-querystring 9235644dd9e52eeae6fa48efd539fdc351a0af53
github.com/gordonklaus/ineffassign 99762ed65232b1477364c8c53778f8b6503e868c
github.com/grpc-ecosystem/grpc-gateway 7ba755f85a3dc73224047317dab675b32d3a91e0
github.com/grpc-ecosystem/grpc-gateway 325488925d6af252d18cc5ade7032127bc898ac7
github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
github.com/jeffjen/datefmt 6688647cfa0439b86e09b097cac96ed328d5fa34
github.com/jteeuwen/go-bindata a0ff2567cfb70903282db057e799fd826784d41d
Expand All @@ -77,41 +77,41 @@ github.com/kkaneda/returncheck bf081fa7155e3a27df1f056a49d50685edfa5b1b
github.com/kr/pretty cfb55aafdaf3ec08f0db22699ab822c50091b1c4
github.com/kr/text 7cafcd837844e784b526369c9bce262804aebc60
github.com/leekchan/timeutil 28917288c48df3d2c1cfe468c273e0b2adda0aa5
github.com/lib/pq ae8357db35d721c58dcdc911318b55bef6b1b001
github.com/lib/pq d8eeeb8bae8896dd8e1b7e514ab0d396c4f12a1b
github.com/lightstep/lightstep-tracer-go 91ae78ce073799b6a40e303d7dec6cc3a4257915
github.com/mattn/go-isatty 66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8
github.com/mattn/go-runewidth 737072b4e32b7a5018b4a7125da8d12de90e8045
github.com/mattn/goveralls edf7508a2bcb40ec1160e94518c983c2fc169f02
github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c
github.com/mdempsky/unconvert beb68d938016d2dec1d1b078054f4d3db25f97be
github.com/mibk/dupl d8ac57fa998861b7aeaa149bba1cb7fceeace18f
github.com/montanaflynn/stats 60dcacf48f43d6dd654d0ed94120ff5806c5ca5c
github.com/mibk/dupl f008fcf5e62793d38bda510ee37aab8b0c68e76c
github.com/montanaflynn/stats f8cd06f93c6c1b06028caafb88b540fc820f77c1
github.com/olekukonko/tablewriter bdcc175572fd7abece6c831e643891b9331bc9e7
github.com/opencontainers/runc 0259c00a35c3e02efa40068fc170be74da97661d
github.com/opencontainers/runc 5f24c9a61ad67f4d3c7a2847dc9bd4a1872795c6
github.com/opentracing/basictracer-go 1b32af207119a14b1b231d451df3ed04a72efebf
github.com/opentracing/opentracing-go 902ca977fd85455c364050f985eba376b44315f0
github.com/pborman/uuid 3d4f2ba23642d3cfd06bd4b54cf03d99d95c0f1b
github.com/petermattis/goid ba001f8780f3bf978180f390ad7b5bac39fbf70a
github.com/pkg/errors 839d9e913e063e28dfd0e6c7b7512793e0a48be9
github.com/pkg/errors 248dadf4e9068a0b3e79f02ed0a610d935de5302
github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6
github.com/prometheus/common 85637ea67b04b5c3bb25e671dacded2977f8f9f6
github.com/rcrowley/go-metrics ab2277b1c5d15c3cba104e9cbddbdfc622df5ad8
github.com/rubyist/circuitbreaker 7e3e7fbe9c62b943d487af023566a79d9eb22d3b
github.com/sasha-s/go-deadlock 09aefc0ac06ad74d91ca31acdb11fc981c159149
github.com/satori/go.uuid b061729afc07e77a8aa4fad0a2fd840958f1942a
github.com/spf13/cobra 856b96dcb49d6427babe192998a35190a12c2230
github.com/spf13/pflag bf8481a6aebc13a8aab52e699ffe2e79771f5a3f
github.com/spf13/cobra 6e91dded25d73176bf7f60b40dd7aa1f0bf9be8d
github.com/spf13/pflag 5ccb023bc27df288a957c5e994cd44fd19619465
github.com/tamird/glock f2bc8b6bb53a3fb0be0f81aff6bb0969bca74ce2
github.com/tebeka/go2xunit a25c391e91f022e9a57de0298ab54019d3aae3b9
github.com/termie/go-shutil bcacb06fecaeec8dc42af03c87c6949f4a05c74c
github.com/wadey/gocovmerge b5bfa59ec0adc420475f97f89b58045c721d761c
golang.org/x/crypto 14f9af67c679edd414f72f13d67c917447113df2
golang.org/x/net 8b4af36cd21a1f85a7484b49feb7c79363106d8e
golang.org/x/oauth2 3c3a985cb79f52a3190fbc056984415ca6763d01
golang.org/x/sys 002cbb5f952456d0c50e0d2aff17ea5eca716979
golang.org/x/text a3ead2188418b52a904ef73f19311038a07ffc3c
golang.org/x/tools 69f6f5b782e1f090edb33f68be67d96673a8059e
google.golang.org/appengine 926995697fa8241be2dc73eb318666e24f44ed51
golang.org/x/crypto 9477e0b78b9ac3d0b03822fd95422e2fe07627cd
golang.org/x/net 569280fa63be4e201b975e5411e30a92178f0118
golang.org/x/oauth2 36bc61733fc9aafc59f010d5e6bfefb63b007fd7
golang.org/x/sys c200b10b5d5e122be351b67af224adc6128af5bf
golang.org/x/text a8b38433e35b65ba247bb267317037dee1b70cea
golang.org/x/tools c74ac01963d19af894026dbcfb7f421906a57d8f
google.golang.org/appengine 46239ca616842c00f41b8cbc6bbf2bd6ffbfcdad
google.golang.org/grpc 79b7c349179cdd6efd8bac4a1ce7f01b98c16e9b
gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
gopkg.in/yaml.v2 a5b47d31c556af34a302ce5d659e6fea44d90de0
Expand Down
18 changes: 9 additions & 9 deletions pkg/acceptance/cluster/docker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ func (cli resilientDockerClient) ContainerCreate(
hostConfig *container.HostConfig,
networkingConfig *network.NetworkingConfig,
containerName string,
) (types.ContainerCreateResponse, error) {
) (container.ContainerCreateCreatedBody, error) {
response, err := cli.APIClient.ContainerCreate(ctx, config, hostConfig, networkingConfig, containerName)
if err != nil && strings.Contains(err.Error(), "already in use") {
log.Infof(ctx, "unable to create container %s: %v", containerName, err)
Expand All @@ -322,7 +322,7 @@ func (cli resilientDockerClient) ContainerCreate(
})
if cerr != nil {
log.Infof(ctx, "unable to list containers: %v", cerr)
return types.ContainerCreateResponse{}, err
return container.ContainerCreateCreatedBody{}, err
}
for _, c := range containers {
for _, n := range c.Names {
Expand All @@ -338,7 +338,7 @@ func (cli resilientDockerClient) ContainerCreate(
}
if rerr := cli.ContainerRemove(ctx, c.ID, options); rerr != nil {
log.Infof(ctx, "unable to remove container: %v", rerr)
return types.ContainerCreateResponse{}, err
return container.ContainerCreateCreatedBody{}, err
}
return cli.ContainerCreate(ctx, config, hostConfig, networkingConfig, containerName)
}
Expand Down Expand Up @@ -413,8 +413,8 @@ func (cli retryingDockerClient) ContainerCreate(
hostConfig *container.HostConfig,
networkingConfig *network.NetworkingConfig,
containerName string,
) (types.ContainerCreateResponse, error) {
var ret types.ContainerCreateResponse
) (container.ContainerCreateCreatedBody, error) {
var ret container.ContainerCreateCreatedBody
err := retry(ctx, cli.attempts, cli.timeout,
"ContainerCreate", matchNone,
func(timeoutCtx context.Context) error {
Expand Down Expand Up @@ -452,8 +452,8 @@ func (cli retryingDockerClient) ContainerKill(ctx context.Context, container, si
})
}

func (cli retryingDockerClient) ContainerWait(ctx context.Context, container string) (int, error) {
var ret int
func (cli retryingDockerClient) ContainerWait(ctx context.Context, container string) (int64, error) {
var ret int64
return ret, retry(ctx, cli.attempts, cli.timeout, "ContainerWait", matchNone,
func(timeoutCtx context.Context) error {
var err error
Expand All @@ -465,8 +465,8 @@ func (cli retryingDockerClient) ContainerWait(ctx context.Context, container str

func (cli retryingDockerClient) ImageList(
ctx context.Context, options types.ImageListOptions,
) ([]types.Image, error) {
var ret []types.Image
) ([]types.ImageSummary, error) {
var ret []types.ImageSummary
return ret, retry(ctx, cli.attempts, cli.timeout, "ImageList", matchNone,
func(timeoutCtx context.Context) error {
var err error
Expand Down
Loading

0 comments on commit 1d59f01

Please sign in to comment.