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:manage libnetwork by subtree instead of submodule #1135

Merged
merged 4 commits into from
Apr 17, 2018

Conversation

rudyfly
Copy link
Collaborator

@rudyfly rudyfly commented Apr 16, 2018

Ⅰ. Describe what this PR did

Manage libnetwork by subtree instead of submodule.
Our libnetwork version is commit “09bc1d0839e32843828ced297ad634822a48c38b”, but we need to backport some patches to fix bugs, such as commit “7751e6f2f01243cca89a46a4e8553876c5d2698c”

Ⅱ. Does this pull request fix one issue?

NONE

Ⅲ. Describe how you did it

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

Signed-off-by: Rudy Zhang rudyflyzhang@gmail.com

rudyfly and others added 4 commits April 16, 2018 21:46
Remove libnetwork submodule, change it to subtree.

Signed-off-by: Rudy Zhang <rudyflyzhang@gmail.com>
git-subtree-dir: extra/libnetwork
git-subtree-split: 09bc1d0839e32843828ced297ad634822a48c38b
Signed-off-by: Frank Yang <yyb196@gmail.com>
@codecov-io
Copy link

Codecov Report

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

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #1135      +/-   ##
=========================================
+ Coverage   15.54%   17.2%   +1.66%     
=========================================
  Files         172     165       -7     
  Lines        9739    8985     -754     
=========================================
+ Hits         1514    1546      +32     
+ Misses       8116    7327     -789     
- Partials      109     112       +3
Impacted Files Coverage Δ
cli/inspect/inspector.go 53.52% <0%> (-19.62%) ⬇️
daemon/mgr/container_utils.go 56.19% <0%> (-1.85%) ⬇️
daemon/mgr/spec_linux.go 0% <0%> (ø) ⬆️
daemon/mgr/container_types.go 15.38% <0%> (ø) ⬆️
cli/inspect.go 0% <0%> (ø) ⬆️
cli/common_flags.go 0% <0%> (ø) ⬆️
cli/start.go 0% <0%> (ø) ⬆️
daemon/mgr/spec.go 0% <0%> (ø) ⬆️
cli/cli.go 0% <0%> (ø) ⬆️
daemon/mgr/system.go 0% <0%> (ø) ⬆️
... and 22 more

@yyb196
Copy link
Collaborator

yyb196 commented Apr 17, 2018

LGTM

@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Apr 17, 2018
@yyb196 yyb196 merged commit 2e671a9 into AliyunContainerService:master Apr 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
areas/network kind/refactor LGTM one maintainer or community participant agrees to merge the pull reuqest. size/XXL
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants