Addressed comments.

This commit is contained in:
Brendan Burns
2015-01-15 15:43:49 -08:00
parent 4209bd4888
commit e8489264cf
3 changed files with 10 additions and 4 deletions

View File

@@ -198,7 +198,7 @@ func Merge(dst runtime.Object, fragment, kind string) error {
}
codec := runtime.CodecFor(api.Scheme, versionString)
intermediate.(map[string]interface{})["kind"] = kind
dataMap["kind"] = kind
data, err := json.Marshal(intermediate)
if err != nil {
return err