From e0f0b9c5884b9205189c7264d3ebd2cee2a85fbd Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Wed, 7 Jan 2015 13:51:43 -0500
Subject: [PATCH] Fix inflight merge conflict by adapting rollingupdate to
 #2861

ClientConfig changed right as rollingupdate was introduced.
---
 pkg/kubectl/cmd/rollingupdate.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg/kubectl/cmd/rollingupdate.go b/pkg/kubectl/cmd/rollingupdate.go
index 839c09c874..b40b9c5a69 100644
--- a/pkg/kubectl/cmd/rollingupdate.go
+++ b/pkg/kubectl/cmd/rollingupdate.go
@@ -21,6 +21,7 @@ import (
 	"io"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"
 	"github.com/spf13/cobra"
 )
@@ -68,7 +69,9 @@ $ cat frontend-v2.json | kubectl rollingupdate frontend-v1 -f -
 			err = CompareNamespaceFromFile(cmd, namespace)
 			checkErr(err)
 
-			client, err := f.ClientBuilder.Client()
+			config, err := f.ClientConfig.ClientConfig()
+			checkErr(err)
+			client, err := client.New(config)
 			checkErr(err)
 			obj, err := mapping.Codec.Decode(data)
 			checkErr(err)