sync: squashed up to merge 1f7e9fd9a2b31ee21babef2cbdd18caeb8c14cdc in e72b32558c8e9ed16690ef5a8e909c12fcc47f87

This commit is contained in:
Kubernetes Prow Robot 2019-01-30 17:50:16 -08:00 committed by Kubernetes Publisher
parent 1fa7ebb984
commit f55470f1d9

2
Godeps/Godeps.json generated
View File

@ -12,7 +12,7 @@
},
{
"ImportPath": "github.com/evanphx/json-patch",
"Rev": "36442dbdb585210f8d5a1b45e67aa323c197d5c4"
"Rev": "d4020504c68b6bfa818032bedfb48e33e9638506"
},
{
"ImportPath": "github.com/gogo/protobuf/proto",