From c2a86cfbd456f0c169d049e16fafa98f59f9a465 Mon Sep 17 00:00:00 2001 From: vaikas-google Date: Mon, 29 Aug 2016 13:31:22 -0700 Subject: [PATCH] fix a return statement with not enough arguments due to merge conflict --- cmd/tiller/release_server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/tiller/release_server.go b/cmd/tiller/release_server.go index 835948cdd..f2c503eee 100644 --- a/cmd/tiller/release_server.go +++ b/cmd/tiller/release_server.go @@ -478,7 +478,7 @@ func (s *releaseServer) renderResources(ch *chart.Chart, values chartutil.Values // removed here. vs, err := s.getVersionSet() if err != nil { - return nil, nil, fmt.Errorf("Could not get apiVersions from Kubernetes: %s", err) + return nil, nil, "", fmt.Errorf("Could not get apiVersions from Kubernetes: %s", err) } hooks, manifests, err := sortManifests(files, vs) if err != nil {