upstream/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-05-28 04:35:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix a return statement with not enough arguments due to merge conflict

Browse source
This commit is contained in:
vaikas-google 2016-08-29 13:31:22 -07:00
parent 492dbb3791
commit c2a86cfbd4
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/tiller/release_server.go
View file

@ -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 {