Merge pull request #24347 from derekwaynecarr/fix_configmap

Automatic merge from submit-queue

Fix ConfigMapList.Items to not use omitempty

Fixes https://github.com/kubernetes/kubernetes/issues/24335
This commit is contained in:
k8s-merge-robot
2016-04-22 04:07:44 -07:00
6 changed files with 45 additions and 56 deletions

View File

@@ -2409,7 +2409,7 @@ type ConfigMapList struct {
unversioned.ListMeta `json:"metadata,omitempty"`
// Items is the list of ConfigMaps.
Items []ConfigMap `json:"items,omitempty"`
Items []ConfigMap `json:"items"`
}
// These constants are for remote command execution and port forwarding and are