Sync libnetwork code to latest docker/master#37
Merged
mrjana merged 1 commit intomoby:masterfrom Apr 10, 2015
aboch:update
Merged
Sync libnetwork code to latest docker/master#37mrjana merged 1 commit intomoby:masterfrom aboch:update
mrjana merged 1 commit intomoby:masterfrom
aboch:update
Conversation
There was a problem hiding this comment.
Just to make sure: any reason to not make this fields of the driver struct today?
Contributor
Author
There was a problem hiding this comment.
My first concern was to bring libnetwork in sync with the latest changes happened in docker driver code, and make sure CI passes.
I am expecting there will be an fair amount of revisit changes after this, and one of them will surely be the one you just pointed out, thanks for that.
Personally I feel more comfortable in not mixing the sync changes (which I feel it is the delicate part) with the refactor changes. I usually opt to work on the refactoring once I have a clean working base.
Let me know.
Contributor
|
Based on @aboch's comments, this LGTM |
- Update: portmapper, portallocator, ipallocator - Remove stale godep dependencies - Update pkg/iptables and others godep to latest - Update bridge code and test after above changes - Merge with latest changes in libnetwork The code is updated up to docker/master commit SHA 86d66d6 Signed-off-by: Alessandro Boch <aboch@docker.com>
Contributor
|
LGTM |
mrjana
added a commit
that referenced
this pull request
Apr 10, 2015
Sync libnetwork code to latest docker/master
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Alessandro Boch aboch@docker.com