From cb1e16cec7305a74e70ef23390e4e54c0f2c0a90 Mon Sep 17 00:00:00 2001
From: Kubernetes Prow Robot <k8s-ci-robot@users.noreply.github.com>
Date: Wed, 30 Jan 2019 17:50:16 -0800
Subject: [PATCH] sync: squashed up to merge
 1f7e9fd9a2b31ee21babef2cbdd18caeb8c14cdc in
 e72b32558c8e9ed16690ef5a8e909c12fcc47f87

---
 Godeps/Godeps.json                  | 2 +-
 pkg/server/storage/storage_codec.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index f620b658b..cad4fc800 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -372,7 +372,7 @@
 		},
 		{
 			"ImportPath": "github.com/evanphx/json-patch",
-			"Rev": "36442dbdb585210f8d5a1b45e67aa323c197d5c4"
+			"Rev": "d4020504c68b6bfa818032bedfb48e33e9638506"
 		},
 		{
 			"ImportPath": "github.com/ghodss/yaml",
diff --git a/pkg/server/storage/storage_codec.go b/pkg/server/storage/storage_codec.go
index 113ac573c..e2f91bf13 100644
--- a/pkg/server/storage/storage_codec.go
+++ b/pkg/server/storage/storage_codec.go
@@ -85,7 +85,7 @@ func NewStorageCodec(opts StorageCodecConfig) (runtime.Codec, error) {
 	)
 	decoder := opts.StorageSerializer.DecoderToVersion(
 		recognizer.NewDecoder(decoders...),
-		runtime.NewMultiGroupVersioner(
+		runtime.NewCoercingMultiGroupVersioner(
 			opts.MemoryVersion,
 			schema.GroupKind{Group: opts.MemoryVersion.Group},
 			schema.GroupKind{Group: opts.StorageVersion.Group},