Merge pull request #10031 from tamird/update-deps

GLOCKFILE: update dependencies

GLOCKFILE

@@ -1,5 +1,6 @@
 cmd github.com/client9/misspell/cmd/misspell
 cmd github.com/cockroachdb/c-protobuf/cmd/protoc
+cmd github.com/cockroachdb/cockroach/pkg/cmd/glock-diff-parser
 cmd github.com/cockroachdb/cockroach/pkg/cmd/protoc-gen-gogoroach
 cmd github.com/cockroachdb/crlfmt
 cmd github.com/cockroachdb/stress
@@ -13,7 +14,6 @@ cmd github.com/mattn/goveralls
 cmd github.com/mdempsky/unconvert
 cmd github.com/mibk/dupl
 cmd github.com/tamird/glock
-cmd github.com/tebeka/go2xunit
 cmd github.com/wadey/gocovmerge
 cmd golang.org/x/tools/cmd/goimports
 cmd golang.org/x/tools/cmd/goyacc
@@ -42,26 +42,26 @@ github.com/cockroachdb/crlfmt 652c0df7fb3088f7b761fbaa36ab8f50b8fb9ed4
 github.com/cockroachdb/pq 44a6473ebbc26e3af09fe57bbdf761475c2c9f7c
 github.com/cockroachdb/stress 029c9348806514969d1109a6ae36e521af411ca7
 github.com/codahale/hdrhistogram 3a0bb77429bd3a61596f5e8a3172445844342120
-github.com/coreos/etcd 33e4f2ea283c187cac459462994d084f44d7c9de
+github.com/coreos/etcd 5c60478953b46e91074a54f5f6683b8afbef8968
 github.com/cpuguy83/go-md2man a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa
-github.com/docker/distribution 99cb7c0946d2f5a38015443e515dc916295064d7
-github.com/docker/docker bd57e6d25c2c9d41a6cf2c9931606f58bb66a07d
+github.com/docker/distribution d0cdc4802b80609f3064f43e680d8968daa06f2e
+github.com/docker/docker cd0e399e062b45bb0c5e11c7eb4de933b1ad0564
 github.com/docker/go-connections 988efe982fdecb46f01d53465878ff1f2ff411ce
 github.com/docker/go-units f2145db703495b2e525c59662db69a7344b00bb8
 github.com/dustin/go-humanize bd88f87ad3a420f7bcf05e90566fd1ceb351fa7f
-github.com/elastic/gosigar 2716c1fe855ee5c88eae707195e0688374458c92
+github.com/elastic/gosigar 15322f7ed81bc3cfedb66b6716fd272ce042e9db
 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 fdc14ac22689d09f8639e603614593811bc1d81c
+github.com/gogo/protobuf 50d1bd39ce4e7a96b75e3e040be9caf79dbb4c61
 github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998
-github.com/golang/lint 64229b89515c2a585c623c79a7ccdea71e8589ff
-github.com/golang/protobuf df1d3ca07d2d07bba352d5b73c4313b4e2a6203e
-github.com/google/btree 7364763242911ab6d418d2722e237194938ebad0
+github.com/golang/lint 3390df4df2787994aea98de825b964ac7944b817
+github.com/golang/protobuf 98fa357170587e470c5f27d3c3ea0947b71eb455
+github.com/google/btree 925471ac9e2131377a91e1595defec898166fe49
 github.com/gordonklaus/ineffassign 99762ed65232b1477364c8c53778f8b6503e868c
-github.com/grpc-ecosystem/grpc-gateway acebe0f9ff5993e130b141ee60e83e592839ca22
+github.com/grpc-ecosystem/grpc-gateway 7ba755f85a3dc73224047317dab675b32d3a91e0
 github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
 github.com/jeffjen/datefmt 6688647cfa0439b86e09b097cac96ed328d5fa34
 github.com/jteeuwen/go-bindata a0ff2567cfb70903282db057e799fd826784d41d
@@ -71,20 +71,20 @@ github.com/kkaneda/returncheck bf081fa7155e3a27df1f056a49d50685edfa5b1b
 github.com/kr/pretty cfb55aafdaf3ec08f0db22699ab822c50091b1c4
 github.com/kr/text 7cafcd837844e784b526369c9bce262804aebc60
 github.com/leekchan/timeutil 28917288c48df3d2c1cfe468c273e0b2adda0aa5
-github.com/lib/pq fcb9ef54da7cae1ea08f0b5a92f236d83e59294a
-github.com/lightstep/lightstep-tracer-go 7ec5005048fddb1fc15627e1bf58796ce01d919e
+github.com/lib/pq ae8357db35d721c58dcdc911318b55bef6b1b001
+github.com/lightstep/lightstep-tracer-go 7e238cc7deca88342f9fb7875ffc97cc450e6607
 github.com/mattn/go-isatty 66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8
-github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f
+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/olekukonko/tablewriter bdcc175572fd7abece6c831e643891b9331bc9e7
-github.com/opencontainers/runc 02f8fa7863dd3f82909a73e2061897828460d52f
+github.com/opencontainers/runc 0259c00a35c3e02efa40068fc170be74da97661d
 github.com/opentracing/basictracer-go 1b32af207119a14b1b231d451df3ed04a72efebf
-github.com/opentracing/opentracing-go 30dda9350627161ff15581c0bdc504e32ec9a536
-github.com/pborman/uuid b984ec7fa9ff9e428bd0cf0abf429384dfbe3e37
+github.com/opentracing/opentracing-go 902ca977fd85455c364050f985eba376b44315f0
+github.com/pborman/uuid 3d4f2ba23642d3cfd06bd4b54cf03d99d95c0f1b
 github.com/petermattis/goid ba001f8780f3bf978180f390ad7b5bac39fbf70a
 github.com/pkg/errors 839d9e913e063e28dfd0e6c7b7512793e0a48be9
 github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6
@@ -93,21 +93,20 @@ 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 9c28e4bbd74e5c3ed7aacbc552b2cab7cfdfe744
-github.com/spf13/pflag c7e63cf4530bcd3ba943729cee0efeff2ebea63f
+github.com/spf13/cobra 856b96dcb49d6427babe192998a35190a12c2230
+github.com/spf13/pflag bf8481a6aebc13a8aab52e699ffe2e79771f5a3f
 github.com/tamird/glock f2bc8b6bb53a3fb0be0f81aff6bb0969bca74ce2
-github.com/tebeka/go2xunit cb8eb3dedfac9cf4cb1f2d8988f3390f2d0cf2e7
 github.com/termie/go-shutil bcacb06fecaeec8dc42af03c87c6949f4a05c74c
 github.com/wadey/gocovmerge b5bfa59ec0adc420475f97f89b58045c721d761c
-golang.org/x/crypto 484eb34681af59703e639b971bc307019182c41f
-golang.org/x/net f4b625ec9b21d620bb5ce57f2dfc3e08ca97fce6
-golang.org/x/sys 8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9
-golang.org/x/text 098f51fb687dbaba1f6efabeafbb6461203f9e21
-golang.org/x/tools 4c4edc0becc8f904a613878ed3e4f970f40a83ce
+golang.org/x/crypto 14f9af67c679edd414f72f13d67c917447113df2
+golang.org/x/net 8b4af36cd21a1f85a7484b49feb7c79363106d8e
+golang.org/x/sys 002cbb5f952456d0c50e0d2aff17ea5eca716979
+golang.org/x/text a3ead2188418b52a904ef73f19311038a07ffc3c
+golang.org/x/tools 69f6f5b782e1f090edb33f68be67d96673a8059e
 google.golang.org/grpc 79b7c349179cdd6efd8bac4a1ce7f01b98c16e9b
 gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
 gopkg.in/yaml.v2 a5b47d31c556af34a302ce5d659e6fea44d90de0
 honnef.co/go/lint a730e73f0085f274d67b586a1d587fd6e42e6708
-honnef.co/go/simple e4b33f62951a263109be351a6e7f516df082e667
+honnef.co/go/simple 12cefce78c236d3784995fb6e655547c4ffe55d0
 honnef.co/go/staticcheck 02337b3080e043d43781e1a0d129df14848f9507
 honnef.co/go/unused b87f9a8e8a85e299bc12d87a5ab27b3434e6ae6e

build/style_test.go

@@ -560,6 +560,7 @@ func TestStyle(t *testing.T) {
 			filter,
 			stream.Sort(),
 			stream.Uniq(),
+			stream.GrepNot(`cockroach/pkg/cmd/`),
 			stream.Grep(` (github\.com/golang/protobuf/proto|github\.com/satori/go\.uuid|log|path|context)$`),
 			stream.GrepNot(`cockroach/pkg/(base|security|util/(log|randutil|stop)): log$`),
 			stream.GrepNot(`cockroach/pkg/(server/serverpb|ts/tspb): github\.com/golang/protobuf/proto$`),