Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: change proto fields number #2793

Merged
merged 1 commit into from
Apr 4, 2019

Conversation

zhuangqh
Copy link
Contributor

@zhuangqh zhuangqh commented Apr 4, 2019

Signed-off-by: zhuangqh zhuangqhc@gmail.com

Ⅰ. Describe what this PR did

avoid the confliction with possible community update

Ⅱ. Does this pull request fix one issue?

Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗?)

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

run hack/protoc/protoc.sh gen_proto to regenerate proto.go

avoid the confliction with possible community update

Signed-off-by: zhuangqh <zhuangqhc@gmail.com>
@codecov
Copy link

codecov bot commented Apr 4, 2019

Codecov Report

Merging #2793 into master will increase coverage by 0.16%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2793      +/-   ##
==========================================
+ Coverage   69.26%   69.42%   +0.16%     
==========================================
  Files         277      277              
  Lines       17313    17313              
==========================================
+ Hits        11992    12020      +28     
+ Misses       3977     3958      -19     
+ Partials     1344     1335       -9
Flag Coverage Δ
#criv1alpha2_test 39.41% <ø> (+0.03%) ⬆️
#integration_test_0 36.58% <ø> (+0.04%) ⬆️
#integration_test_1 35.4% <ø> (+0.06%) ⬆️
#integration_test_2 36.39% <ø> (-0.06%) ⬇️
#integration_test_3 35.39% <ø> (ø) ⬆️
#node_e2e_test 35.14% <ø> (+0.12%) ⬆️
#unittest 28.67% <ø> (ø) ⬆️
Impacted Files Coverage Δ
ctrd/watch.go 71.83% <0%> (-2.82%) ⬇️
ctrd/container.go 53.91% <0%> (ø) ⬆️
daemon/mgr/container.go 60.59% <0%> (+0.42%) ⬆️
cri/v1alpha2/cri.go 71.22% <0%> (+0.63%) ⬆️
daemon/mgr/spec_linux.go 80.07% <0%> (+1.06%) ⬆️
cri/stream/runtime.go 70.23% <0%> (+2.38%) ⬆️
apis/server/utils.go 75% <0%> (+3.84%) ⬆️
cri/stream/portforward/httpstream.go 77.77% <0%> (+6.83%) ⬆️
cri/ocicni/cni_manager.go 70.58% <0%> (+11.76%) ⬆️

Copy link
Contributor

@fuweid fuweid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fuweid fuweid merged commit 52d9170 into AliyunContainerService:master Apr 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants