github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #30270 from ZJU-SEL/fix-minor-mistakes

Browse Source 
Automatic merge from submit-queue

fix minor mistakes

<!--
Checklist for submitting a Pull Request

Please remove this comment block before submitting.

1. Please read our [contributor guidelines](https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md).
2. See our [developer guide](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md).
3. If you want this PR to automatically close an issue when it is merged,
   add `fixes #<issue number>` or `fixes #<issue number>, fixes #<issue number>`
   to close multiple issues (see: https://github.com/blog/1506-closing-issues-via-pull-requests).
4. Follow the instructions for [labeling and writing a release note for this PR](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes) in the block below.
-->

Signed-off-by: Xianglin Gao <xlgao@zju.edu.cn>
This commit is contained in:
Kubernetes Submit Queue
2016-08-22 17:40:39 -07:00
committed by GitHub
parent 6a1c63fd37 3b8f932ea9
commit 0babf0ed6d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/api/v1alpha1/runtime/api.pb.go
View File

@@ -1575,7 +1575,7 @@ type ContainerFilter struct {
Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
// ID of the container. // ID of the container.
Id *string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"` Id *string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
// State of the contianer. // State of the container.
State *ContainerState `protobuf:"varint,3,opt,name=state,enum=runtime.ContainerState" json:"state,omitempty"` State *ContainerState `protobuf:"varint,3,opt,name=state,enum=runtime.ContainerState" json:"state,omitempty"`
// The id of the pod sandbox // The id of the pod sandbox
PodSandboxId *string `protobuf:"bytes,4,opt,name=pod_sandbox_id,json=podSandboxId" json:"pod_sandbox_id,omitempty"` PodSandboxId *string `protobuf:"bytes,4,opt,name=pod_sandbox_id,json=podSandboxId" json:"pod_sandbox_id,omitempty"`

2
pkg/kubelet/api/v1alpha1/runtime/api.proto
View File

@@ -464,7 +464,7 @@ message ContainerFilter {
optional string name = 1; optional string name = 1;
// ID of the container. // ID of the container.
optional string id = 2; optional string id = 2;
// State of the contianer. // State of the container.
optional ContainerState state = 3; optional ContainerState state = 3;
// The id of the pod sandbox // The id of the pod sandbox
optional string pod_sandbox_id = 4; optional string pod_sandbox_id = 4;