github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #18985 from mlafeldt/patch-1 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2015-12-22 00:48:54 -08:00
parent 9168a5c8b1 1701cd4a3a
commit 058896340d
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/util/yaml/decoder.go
View File

@ -29,8 +29,8 @@ import (
// ToJSON converts a single YAML document into a JSON document // ToJSON converts a single YAML document into a JSON document
// or returns an error. If the document appears to be JSON the // or returns an error. If the document appears to be JSON the
// YAML decoding path is not used (so that error messages are) // YAML decoding path is not used (so that error messages are
// JSON specific. // JSON specific).
func ToJSON(data []byte) ([]byte, error) { func ToJSON(data []byte) ([]byte, error) {
if hasJSONPrefix(data) { if hasJSONPrefix(data) {
return data, nil return data, nil