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

Revert "fix: make iterateTLSConfig only work for TLS config" #2111

Merged
merged 1 commit into from
Aug 17, 2018

Conversation

Ace-Tang
Copy link
Contributor

Reverts #2057

@pouchrobot
Copy link
Collaborator

Thanks for your contribution. 🍻 @Ace-Tang
While we thought PR Description could be more specific, longer than 100 chars.
Please edit this PR title instead of opening a new one.
More details, please refer to https://github.com/alibaba/pouch/blob/master/CONTRIBUTING.md

@pouchrobot pouchrobot added kind/bug This is bug report for project size/M labels Aug 17, 2018
@pouchrobot
Copy link
Collaborator

@Ace-Tang Thanks for your contribution. 🍻
Please sign off in each of your commits.

@allencloud
Copy link
Collaborator

Since it is a revert action, we can merge this. LGTM

@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Aug 17, 2018
@allencloud allencloud merged commit 5847b76 into master Aug 17, 2018
@allencloud
Copy link
Collaborator

Why to revert this? @Ace-Tang

@allencloud allencloud deleted the revert-2057-config branch August 17, 2018 07:42
@codecov-io
Copy link

codecov-io commented Aug 17, 2018

Codecov Report

Merging #2111 into master will increase coverage by 0.11%.
The diff coverage is 75%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #2111      +/-   ##
=========================================
+ Coverage   65.09%   65.2%   +0.11%     
=========================================
  Files         208     208              
  Lines       16411   16411              
=========================================
+ Hits        10682   10701      +19     
+ Misses       4399    4384      -15     
+ Partials     1330    1326       -4
Flag Coverage Δ
#criv1alpha1test 33.39% <0%> (+0.08%) ⬆️
#criv1alpha2test 34% <0%> (+0.06%) ⬆️
#integrationtest 39.85% <0%> (+0.05%) ⬆️
#unittest 23.91% <75%> (+0.04%) ⬆️
Impacted Files Coverage Δ
daemon/config/config.go 48.75% <75%> (+6.25%) ⬆️
daemon/mgr/container.go 56.3% <0%> (+0.2%) ⬆️
daemon/logger/jsonfile/utils.go 73.17% <0%> (+1.62%) ⬆️
ctrd/image.go 78.94% <0%> (+2.19%) ⬆️
ctrd/watch.go 80.3% <0%> (+4.54%) ⬆️
apis/server/utils.go 66.66% <0%> (+4.76%) ⬆️

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/M
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants