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 "Merge pull request #2339 from phyber/iptables-check" #2466

Merged
merged 1 commit into from
Oct 11, 2019

Conversation

arkodg
Copy link
Contributor

@arkodg arkodg commented Oct 11, 2019

This reverts commit 820deef, reversing
changes made to 19e372a.

@GordonTheTurtle
Copy link

Please sign your commits following these rules:
https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "revert-iptables-docker-user" [email protected]:arkodg/libnetwork.git somewhere
$ cd somewhere
$ git commit --amend -s --no-edit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

This reverts commit 820deef, reversing
changes made to 19e372a.

Signed-off-by: Arko Dasgupta <[email protected]>
@arkodg arkodg force-pushed the revert-iptables-docker-user branch from aa34b95 to 8db595c Compare October 11, 2019 16:38
@mavenugo
Copy link
Contributor

Thanks @arkodg. LGTM

@arkodg
Copy link
Contributor Author

arkodg commented Oct 11, 2019

PTAL @euanh @selansen

@arkodg
Copy link
Contributor Author

arkodg commented Oct 11, 2019

cc: @thaJeztah

@euanh euanh self-requested a review October 11, 2019 16:57
Copy link
Collaborator

@selansen selansen left a comment

Choose a reason for hiding this comment

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

LGTM

@selansen selansen merged commit 90afbb0 into moby:master Oct 11, 2019
@arkodg arkodg deleted the revert-iptables-docker-user branch October 11, 2019 17:14
@thaJeztah
Copy link
Member

thaJeztah commented Oct 11, 2019

This reverts #2339 controller: Check if IPTables is enabled for arrangeUserFilterRule

arkodg pushed a commit to arkodg/libnetwork that referenced this pull request Oct 11, 2019
Revert "Merge pull request moby#2339 from phyber/iptables-check"

(cherry picked from commit 90afbb0)
Signed-off-by: Arko Dasgupta <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants