Merge pull request #20487 from deads2k/fix-unstructured

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-06 06:49:13 -08:00
commit f769ecdabc

View File

@ -26,12 +26,10 @@ import (
// UnstructuredJSONScheme is capable of converting JSON data into the Unstructured
// type, which can be used for generic access to objects without a predefined scheme.
// TODO: move into serializer/json.
var UnstructuredJSONScheme Decoder = unstructuredJSONScheme{}
var UnstructuredJSONScheme Codec = unstructuredJSONScheme{}
type unstructuredJSONScheme struct{}
var _ Codec = unstructuredJSONScheme{}
func (s unstructuredJSONScheme) Decode(data []byte, _ *unversioned.GroupVersionKind, _ Object) (Object, *unversioned.GroupVersionKind, error) {
unstruct := &Unstructured{}