From f886b06a2eb2936531f56904548a5f5f8b199295 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Fri, 4 Oct 2019 00:49:56 -0700
Subject: [PATCH] Merge pull request #83434 from
 liggitt/automated-cherry-pick-of-#83261-upstream-release-1.15

[1.15] Automated cherry pick of #83261: bump gopkg.in/yaml.v2 v2.2.4

Kubernetes-commit: 9a83f46a506124685802559c4a3981f4f415d1de
---
 Godeps/Godeps.json |  8 ++++----
 go.mod             | 17 ++++++++---------
 go.sum             |  4 ++++
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 3f9638d7..ef8ec08c 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -212,19 +212,19 @@
 		},
 		{
 			"ImportPath": "gopkg.in/yaml.v2",
-			"Rev": "v2.2.1"
+			"Rev": "v2.2.4"
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "e14a4b1f5f84"
+			"Rev": "3a12735a829a"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "f2f3a405f61d"
+			"Rev": "31ade1b30762"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "637fc595d17a"
+			"Rev": "b2f42092e376"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
diff --git a/go.mod b/go.mod
index 813e48f3..d1616c29 100644
--- a/go.mod
+++ b/go.mod
@@ -5,10 +5,10 @@ module k8s.io/sample-controller
 go 1.12
 
 require (
-	k8s.io/api v0.0.0
-	k8s.io/apimachinery v0.0.0
-	k8s.io/client-go v0.0.0
-	k8s.io/code-generator v0.0.0
+	k8s.io/api v0.0.0-20191004120003-3a12735a829a
+	k8s.io/apimachinery v0.0.0-20191004115701-31ade1b30762
+	k8s.io/client-go v0.0.0-20191004120415-b2f42092e376
+	k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
 	k8s.io/klog v0.3.1
 )
 
@@ -16,9 +16,8 @@ replace (
 	golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
 	golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
 	golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
-	k8s.io/api => ../api
-	k8s.io/apimachinery => ../apimachinery
-	k8s.io/client-go => ../client-go
-	k8s.io/code-generator => ../code-generator
-	k8s.io/sample-controller => ../sample-controller
+	k8s.io/api => k8s.io/api v0.0.0-20191004120003-3a12735a829a
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191004115701-31ade1b30762
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20191004120415-b2f42092e376
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
 )
diff --git a/go.sum b/go.sum
index 4ca55fb1..e34ee204 100644
--- a/go.sum
+++ b/go.sum
@@ -96,6 +96,10 @@ 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.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+k8s.io/api v0.0.0-20191004120003-3a12735a829a/go.mod h1:ceHJE/vDjU8jKnRV6Vqn/+vyZmC6NvOluInN+RhQkIs=
+k8s.io/apimachinery v0.0.0-20191004115701-31ade1b30762/go.mod h1:Xc10RHc1U+F/e9GCloJ8QAeCGevSVP5xhOhqlE+e1kM=
+k8s.io/client-go v0.0.0-20191004120415-b2f42092e376/go.mod h1:ksVkYlACXo9hR9AV+cYyCkuWL1xnWcGtAFxsfqMcozg=
+k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b/go.mod h1:G8bQwmHm2eafm5bgtX67XDZQ8CWKSGu9DekI+yN4Y5I=
 k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af h1:SwjZbO0u5ZuaV6TRMWOGB40iaycX8sbdMQHtjNZ19dk=
 k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=