Skip to content

Include network settings as part of the service config hash. #3128

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.

Sign up for GitHub

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

Jump to bottom
Merged
aanand merged 3 commits into from
Mar 23, 2016
Merged

Include network settings as part of the service config hash. #3128

aanand merged 3 commits into from
Mar 23, 2016

Conversation

@dnephin
Copy link

@dnephin dnephin commented Mar 15, 2016

Fixes #3123

@dnephin dnephin added this to the 1.7.0 milestone Mar 15, 2016
@aanand
Copy link

aanand commented Mar 16, 2016

Is there any reason not to just use self.networks() instead of list(self.networks.items())?

@dnephin dnephin force-pushed the add_network_settings_to_config_hash branch from 8bb3ab3 to 4e10f43 Compare March 17, 2016 02:04
@dnephin
Copy link
Author

dnephin commented Mar 17, 2016

Seems to work, I didn't think of that at the time.

@dnephin dnephin force-pushed the add_network_settings_to_config_hash branch from 7eb579f to 42fca14 Compare March 17, 2016 19:57
@dnephin
Copy link
Author

dnephin commented Mar 17, 2016

BasicProjectTest.test_partial_change seems to be failing reliably on py34. Testing it locally I can get it to fail occasionally on py35, but it seems to be related to failing to remove the container, so I'm not sure what that has to do with this change.

@dnephin
Copy link
Author

dnephin commented Mar 17, 2016

Actually #3137 keeps failing that way as well, so maybe it really is a jenkins issue

dnephin added 3 commits March 18, 2016 18:19
@dnephin
Fix flaky network test.
25cbc2a 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
@dnephin
Include network settings as part of the service config hash.
089ec66 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
@dnephin
Make a new flaky test less flaky.
dfac48f 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
@dnephin dnephin force-pushed the add_network_settings_to_config_hash branch from 42fca14 to dfac48f Compare March 18, 2016 22:20
@aanand
Copy link

aanand commented Mar 23, 2016

LGTM

@aanand aanand merged commit c3eca82 into docker:master Mar 23, 2016
@dnephin dnephin deleted the add_network_settings_to_config_hash branch March 23, 2016 18:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

kind/bug status/0-triage

Projects

None yet

Milestone

1.7.0

Development

Successfully merging this pull request may close these issues.

3 participants

@dnephin @aanand @GordonTheTurtle