From a297a0a7fe14779e7cfdcfa15a13237a34b42af7 Mon Sep 17 00:00:00 2001 From: Matthew Fisher Date: Mon, 17 Sep 2018 09:48:51 -0700 Subject: [PATCH] fix merge conflicts/linter errors (#4653) Signed-off-by: Matthew Fisher --- cmd/helm/serve.go | 2 +- pkg/tiller/hooks.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/helm/serve.go b/cmd/helm/serve.go index 81f2785c3..7ddae6ca2 100644 --- a/cmd/helm/serve.go +++ b/cmd/helm/serve.go @@ -38,7 +38,7 @@ This command is intended to be used for educational and testing purposes only. It is best to rely on a dedicated web server or a cloud-hosted solution like Google Cloud Storage for production use. -See https://github.com/kubernetes/helm/blob/master/docs/chart_repository.md#hosting-chart-repositories +See https://github.com/helm/helm/blob/master/docs/chart_repository.md#hosting-chart-repositories for more information on hosting chart repositories in a production setting. ` diff --git a/pkg/tiller/hooks.go b/pkg/tiller/hooks.go index 6c3543f61..0fb7c92f8 100644 --- a/pkg/tiller/hooks.go +++ b/pkg/tiller/hooks.go @@ -53,6 +53,7 @@ var deletePolices = map[string]release.Hook_DeletePolicy{ hooks.BeforeHookCreation: release.Hook_BEFORE_HOOK_CREATION, } +// Manifest represents a manifest file, which has a name and some content. type Manifest = manifest.Manifest type result struct {