Skip to content

Conversation

@starnop
Copy link
Contributor

@starnop starnop commented Jun 11, 2018

Signed-off-by: Starnop [email protected]

Ⅰ. Describe what this PR did

  • Delete '\r' in hack/kubernetes/allinone_aliyun.sh to pass shellcheck
  • Delete unused variables in hack/kubernetes/allinone_aliyun.sh to pass shellcheck

Ⅱ. Does this pull request fix one issue?

None

Ⅲ. Describe how you did it

tr -d '\r' < hack/kubernetes/allinone_aliyun.sh > hack/kubernetes/allinone_aliyun.sh.bak
rm -rf hack/kubernetes/allinone_aliyun.sh
mv hack/kubernetes/allinone_aliyun.sh.bak hack/kubernetes/allinone_aliyun.sh

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@starnop starnop changed the title :delete '\r' in hack/kubernetes/allinone_aliyun.sh to pass shellcheck fix :delete '\r' in hack/kubernetes/allinone_aliyun.sh to pass shellcheck Jun 11, 2018
@starnop starnop changed the title fix :delete '\r' in hack/kubernetes/allinone_aliyun.sh to pass shellcheck fix: Delete '\r' in hack/kubernetes/allinone_aliyun.sh to pass shellcheck Jun 11, 2018
@pouchrobot pouchrobot added the kind/bug This is bug report for project label Jun 11, 2018
@allencloud
Copy link
Collaborator

CRI-tools validation fails, PTAL @starnop

@starnop starnop changed the title fix: Delete '\r' in hack/kubernetes/allinone_aliyun.sh to pass shellcheck fix: Make hack/kubernetes/allinone_aliyun.sh to pass shellcheck Jun 12, 2018
@codecov-io
Copy link

Codecov Report

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

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1507      +/-   ##
==========================================
+ Coverage   40.54%   40.56%   +0.02%     
==========================================
  Files         254      254              
  Lines       16535    16535              
==========================================
+ Hits         6704     6708       +4     
+ Misses       8968     8965       -3     
+ Partials      863      862       -1
Impacted Files Coverage Δ
daemon/logger/jsonfile/utils.go 71.66% <0%> (+1.66%) ⬆️
apis/server/utils.go 64.28% <0%> (+4.76%) ⬆️

@allencloud
Copy link
Collaborator

LGTM

@allencloud allencloud merged commit 2f74f22 into AliyunContainerService:master Jun 12, 2018
@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Jun 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

areas/orchestration kind/bug This is bug report for project LGTM one maintainer or community participant agrees to merge the pull reuqest. size/XL

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants