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 2

Merge pull request #3494 from Thiht/patch-1

Browse source 
docs: Fix FromJson comment
This commit is contained in:
Matthew Fisher 2018-02-27 15:14:02 +00:00 committed by GitHub
commit be1e974ccc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/chartutil/files.go
View file

@ -220,10 +220,10 @@ func ToJson(v interface{}) string {
return string(data)
}
// FromJson converts a YAML document into a map[string]interface{}.
// FromJson converts a JSON document into a map[string]interface{}.
//
// This is not a general-purpose JSON parser, and will not parse all valid
// YAML documents. Additionally, because its intended use is within templates
// JSON documents. Additionally, because its intended use is within templates
// it tolerates errors. It will insert the returned error message string into
// m["Error"] in the returned map.
func FromJson(str string) map[string]interface{} {