From 162fd08051c67beae9d0ccf3790ea0841e59404f Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Wed, 3 Jul 2019 12:29:39 -0700 Subject: [PATCH] Merge pull request #79306 from vllry/gogo-dep-tag Updated github.com/gogo/protobuf from v0.5 SHA to v1.0.0 tag Kubernetes-commit: 03aeab967abccc1da80ff2340f3bccf2131f63d8 --- Godeps/Godeps.json | 6 +++--- go.mod | 9 ++++----- go.sum | 2 ++ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 9ff03c6..b3dee5a 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -28,7 +28,7 @@ }, { "ImportPath": "github.com/gogo/protobuf", - "Rev": "342cbe0a0415" + "Rev": "v1.0.0" }, { "ImportPath": "github.com/golang/groupcache", @@ -156,11 +156,11 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "5b0469dfd244" + "Rev": "39734b2a72fe" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "05b5762916b3" + "Rev": "4cfb76a8bf76" }, { "ImportPath": "k8s.io/klog", diff --git a/go.mod b/go.mod index cb03c7f..0f31c42 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,8 @@ module k8s.io/kubelet go 1.12 require ( - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 + k8s.io/api v0.0.0-20190703205437-39734b2a72fe + k8s.io/apimachinery v0.0.0-20190703205208-4cfb76a8bf76 ) replace ( @@ -15,7 +15,6 @@ replace ( golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/kubelet => ../kubelet + k8s.io/api => k8s.io/api v0.0.0-20190703205437-39734b2a72fe + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190703205208-4cfb76a8bf76 ) diff --git a/go.sum b/go.sum index cd30279..fceb34f 100644 --- a/go.sum +++ b/go.sum @@ -58,6 +58,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +k8s.io/api v0.0.0-20190703205437-39734b2a72fe/go.mod h1:J5EZ0KSEjvyKOBy5BDHSF3zn82madLLWg7nUKaOHZKU= +k8s.io/apimachinery v0.0.0-20190703205208-4cfb76a8bf76/go.mod h1:M2fZgZL9DbLfeJaPBCDqSqNsdsmLN+V29knYJnIXlMA= k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68= k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=