Merge pull request #6310 from dchen1107/clean

Small cleanup on api/types.go
pull/6/head
Victor Marmol 2015-04-01 17:37:00 -07:00
commit 8cd8a8f098
1 changed files with 2 additions and 2 deletions

View File

@ -610,8 +610,8 @@ type ContainerStatus struct {
RestartCount int `json:"restartCount"`
// TODO(dchen1107): Need to decide how to represent this in v1beta3
Image string `json:"image"`
ImageID string `json:"imageID" description:"ID of the container's image"`
ContainerID string `json:"containerID,omitempty" description:"container's ID in the format 'docker://<container_id>'"`
ImageID string `json:"imageID"`
ContainerID string `json:"containerID,omitempty"`
}
// PodPhase is a label for the condition of a pod at the current time.