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

fix: replace DelContainerForceOk with DelContainerForceMultyTime #1462

Merged
merged 1 commit into from
Jun 4, 2018

Conversation

zhuangqh
Copy link
Contributor

@zhuangqh zhuangqh commented Jun 4, 2018

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

Ⅰ. Describe what this PR did

replace DelContainerForceOk with DelContainerForceMultyTime

Ⅱ. Does this pull request fix one issue?

fixes #1376

Ⅲ. Describe how you did it

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

Signed-off-by: zhuangqh <zhuangqhc@163.com>
@pouchrobot pouchrobot added kind/bug This is bug report for project size/L labels Jun 4, 2018
@Letty5411
Copy link
Contributor

LGTM

@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Jun 4, 2018
@codecov-io
Copy link

codecov-io commented Jun 4, 2018

Codecov Report

Merging #1462 into master will decrease coverage by 1.5%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1462      +/-   ##
==========================================
- Coverage   40.07%   38.56%   -1.51%     
==========================================
  Files         250      250              
  Lines       16351    17057     +706     
==========================================
+ Hits         6552     6578      +26     
- Misses       8954     9629     +675     
- Partials      845      850       +5
Impacted Files Coverage Δ
apis/server/container_bridge.go 53.8% <0%> (-29.09%) ⬇️
apis/server/volume_bridge.go 63.1% <0%> (-23.56%) ⬇️
apis/server/network_bridge.go 44.87% <0%> (-18.77%) ⬇️
apis/server/utils.go 49.09% <0%> (-15.2%) ⬇️
daemon/mgr/container.go 36.21% <0%> (-13.79%) ⬇️
pkg/system/cgroup.go 87.09% <0%> (-6.46%) ⬇️
daemon/mgr/container_utils.go 51.07% <0%> (-0.25%) ⬇️
ctrd/container.go 50.18% <0%> (+0.72%) ⬆️
daemon/logger/jsonfile/utils.go 71.66% <0%> (+1.66%) ⬆️
ctrd/image.go 79.42% <0%> (+1.71%) ⬆️

@allencloud allencloud merged commit f924313 into AliyunContainerService:master Jun 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug This is bug report for project LGTM one maintainer or community participant agrees to merge the pull reuqest. size/L
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[help wanted] replace DelContainerForceOk with DelContainerForceMultyTime
5 participants