msb-public
/
helm
mirror of https://github.com/helm/helm
1
0
Code Issues Projects Releases Wiki Activity

fix merge conflicts/linter errors (#4653)

Browse Source 
Signed-off-by: Matthew Fisher <matt.fisher@microsoft.com>
pull/4649/head
Matthew Fisher 6 years ago committed by GitHub
parent 5a38e8fea9
commit a297a0a7fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File

2
cmd/helm/serve.go
Unescape View File

@ -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 It is best to rely on a dedicated web server or a cloud-hosted solution like
Google Cloud Storage for production use. 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. for more information on hosting chart repositories in a production setting.
` `

1
pkg/tiller/hooks.go
Unescape View File

@ -53,6 +53,7 @@ var deletePolices = map[string]release.Hook_DeletePolicy{
hooks.BeforeHookCreation: release.Hook_BEFORE_HOOK_CREATION, hooks.BeforeHookCreation: release.Hook_BEFORE_HOOK_CREATION,
} }
// Manifest represents a manifest file, which has a name and some content.
type Manifest = manifest.Manifest type Manifest = manifest.Manifest
type result struct { type result struct {

Write Preview
Loading…
Cancel
Save