From 51b30d8e2cecf988a997b6a6751ca03d209ad749 Mon Sep 17 00:00:00 2001
From: jennybuckley <jennybuckley@google.com>
Date: Mon, 14 Jan 2019 14:37:56 -0800
Subject: [PATCH] Update structured-merge-diff version

---
 Godeps/Godeps.json                                  | 10 +++++-----
 .../apiextensions-apiserver/Godeps/Godeps.json      | 10 +++++-----
 staging/src/k8s.io/apimachinery/Godeps/Godeps.json  | 10 +++++-----
 staging/src/k8s.io/apiserver/Godeps/Godeps.json     | 10 +++++-----
 staging/src/k8s.io/cli-runtime/Godeps/Godeps.json   | 10 +++++-----
 staging/src/k8s.io/client-go/Godeps/Godeps.json     | 10 +++++-----
 .../src/k8s.io/cloud-provider/Godeps/Godeps.json    | 10 +++++-----
 staging/src/k8s.io/csi-api/Godeps/Godeps.json       | 10 +++++-----
 .../src/k8s.io/kube-aggregator/Godeps/Godeps.json   | 10 +++++-----
 staging/src/k8s.io/metrics/Godeps/Godeps.json       | 10 +++++-----
 staging/src/k8s.io/node-api/Godeps/Godeps.json      | 10 +++++-----
 .../src/k8s.io/sample-apiserver/Godeps/Godeps.json  | 10 +++++-----
 .../src/k8s.io/sample-cli-plugin/Godeps/Godeps.json | 10 +++++-----
 .../src/k8s.io/sample-controller/Godeps/Godeps.json | 10 +++++-----
 .../structured-merge-diff/merge/update.go           | 13 +++++++++----
 15 files changed, 79 insertions(+), 74 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 8dd058cecc4..0ee53b81eb8 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -4220,23 +4220,23 @@
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/yaml",
diff --git a/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json
index b0f4f493475..02b3695ca2b 100644
--- a/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json
+++ b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json
@@ -2608,23 +2608,23 @@
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/yaml",
diff --git a/staging/src/k8s.io/apimachinery/Godeps/Godeps.json b/staging/src/k8s.io/apimachinery/Godeps/Godeps.json
index 34aa6103f30..dae3a4c0fc5 100644
--- a/staging/src/k8s.io/apimachinery/Godeps/Godeps.json
+++ b/staging/src/k8s.io/apimachinery/Godeps/Godeps.json
@@ -180,23 +180,23 @@
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/yaml",
diff --git a/staging/src/k8s.io/apiserver/Godeps/Godeps.json b/staging/src/k8s.io/apiserver/Godeps/Godeps.json
index c66d975afa9..e8d0ebf3d9e 100644
--- a/staging/src/k8s.io/apiserver/Godeps/Godeps.json
+++ b/staging/src/k8s.io/apiserver/Godeps/Godeps.json
@@ -2092,23 +2092,23 @@
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/yaml",
diff --git a/staging/src/k8s.io/cli-runtime/Godeps/Godeps.json b/staging/src/k8s.io/cli-runtime/Godeps/Godeps.json
index c6322e29c5e..c179f411c23 100644
--- a/staging/src/k8s.io/cli-runtime/Godeps/Godeps.json
+++ b/staging/src/k8s.io/cli-runtime/Godeps/Godeps.json
@@ -784,23 +784,23 @@
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/yaml",
diff --git a/staging/src/k8s.io/client-go/Godeps/Godeps.json b/staging/src/k8s.io/client-go/Godeps/Godeps.json
index 27d35b890e7..b8c5b8552fa 100644
--- a/staging/src/k8s.io/client-go/Godeps/Godeps.json
+++ b/staging/src/k8s.io/client-go/Godeps/Godeps.json
@@ -620,23 +620,23 @@
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/yaml",
diff --git a/staging/src/k8s.io/cloud-provider/Godeps/Godeps.json b/staging/src/k8s.io/cloud-provider/Godeps/Godeps.json
index 646ede3525b..f567f4f3f05 100644
--- a/staging/src/k8s.io/cloud-provider/Godeps/Godeps.json
+++ b/staging/src/k8s.io/cloud-provider/Godeps/Godeps.json
@@ -976,23 +976,23 @@
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/yaml",
diff --git a/staging/src/k8s.io/csi-api/Godeps/Godeps.json b/staging/src/k8s.io/csi-api/Godeps/Godeps.json
index f443fb703d4..fe0cd519252 100644
--- a/staging/src/k8s.io/csi-api/Godeps/Godeps.json
+++ b/staging/src/k8s.io/csi-api/Godeps/Godeps.json
@@ -560,23 +560,23 @@
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/yaml",
diff --git a/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json b/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json
index 66230c8c905..185234753f2 100644
--- a/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json
+++ b/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json
@@ -1884,23 +1884,23 @@
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/yaml",
diff --git a/staging/src/k8s.io/metrics/Godeps/Godeps.json b/staging/src/k8s.io/metrics/Godeps/Godeps.json
index d6ea6d2ae08..29ff8b9084c 100644
--- a/staging/src/k8s.io/metrics/Godeps/Godeps.json
+++ b/staging/src/k8s.io/metrics/Godeps/Godeps.json
@@ -532,23 +532,23 @@
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/yaml",
diff --git a/staging/src/k8s.io/node-api/Godeps/Godeps.json b/staging/src/k8s.io/node-api/Godeps/Godeps.json
index ba55980c2a5..3cdbad7bbc7 100644
--- a/staging/src/k8s.io/node-api/Godeps/Godeps.json
+++ b/staging/src/k8s.io/node-api/Godeps/Godeps.json
@@ -560,23 +560,23 @@
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/yaml",
diff --git a/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json b/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json
index a117a4b2bef..1a935fffa58 100644
--- a/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json
+++ b/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json
@@ -1836,23 +1836,23 @@
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/yaml",
diff --git a/staging/src/k8s.io/sample-cli-plugin/Godeps/Godeps.json b/staging/src/k8s.io/sample-cli-plugin/Godeps/Godeps.json
index fa2ba84636d..2a945848126 100644
--- a/staging/src/k8s.io/sample-cli-plugin/Godeps/Godeps.json
+++ b/staging/src/k8s.io/sample-cli-plugin/Godeps/Godeps.json
@@ -800,23 +800,23 @@
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/yaml",
diff --git a/staging/src/k8s.io/sample-controller/Godeps/Godeps.json b/staging/src/k8s.io/sample-controller/Godeps/Godeps.json
index 9955274c75e..e4398059f7c 100644
--- a/staging/src/k8s.io/sample-controller/Godeps/Godeps.json
+++ b/staging/src/k8s.io/sample-controller/Godeps/Godeps.json
@@ -1180,23 +1180,23 @@
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
-			"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
+			"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/yaml",
diff --git a/vendor/sigs.k8s.io/structured-merge-diff/merge/update.go b/vendor/sigs.k8s.io/structured-merge-diff/merge/update.go
index 24df5ce69f3..3e7ce935728 100644
--- a/vendor/sigs.k8s.io/structured-merge-diff/merge/update.go
+++ b/vendor/sigs.k8s.io/structured-merge-diff/merge/update.go
@@ -32,7 +32,7 @@ type Updater struct {
 	Converter Converter
 }
 
-func (s *Updater) update(oldObject, newObject typed.TypedValue, managers fieldpath.ManagedFields, workflow string, force bool) (fieldpath.ManagedFields, error) {
+func (s *Updater) update(oldObject, newObject typed.TypedValue, version fieldpath.APIVersion, managers fieldpath.ManagedFields, workflow string, force bool) (fieldpath.ManagedFields, error) {
 	if managers == nil {
 		managers = fieldpath.ManagedFields{}
 	}
@@ -41,7 +41,12 @@ func (s *Updater) update(oldObject, newObject typed.TypedValue, managers fieldpa
 		oldObject typed.TypedValue
 		newObject typed.TypedValue
 	}
-	versions := map[fieldpath.APIVersion]Versioned{}
+	versions := map[fieldpath.APIVersion]Versioned{
+		version: Versioned{
+			oldObject: oldObject,
+			newObject: newObject,
+		},
+	}
 
 	for manager, managerSet := range managers {
 		if manager == workflow {
@@ -92,7 +97,7 @@ func (s *Updater) update(oldObject, newObject typed.TypedValue, managers fieldpa
 // this is a CREATE call).
 func (s *Updater) Update(liveObject, newObject typed.TypedValue, version fieldpath.APIVersion, managers fieldpath.ManagedFields, manager string) (fieldpath.ManagedFields, error) {
 	var err error
-	managers, err = s.update(liveObject, newObject, managers, manager, true)
+	managers, err = s.update(liveObject, newObject, version, managers, manager, true)
 	if err != nil {
 		return fieldpath.ManagedFields{}, err
 	}
@@ -118,7 +123,7 @@ func (s *Updater) Apply(liveObject, configObject typed.TypedValue, version field
 	if err != nil {
 		return typed.TypedValue{}, fieldpath.ManagedFields{}, fmt.Errorf("failed to merge config: %v", err)
 	}
-	managers, err = s.update(liveObject, newObject, managers, manager, force)
+	managers, err = s.update(liveObject, newObject, version, managers, manager, force)
 	if err != nil {
 		return typed.TypedValue{}, fieldpath.ManagedFields{}, err
 	}