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

Implemented dns_opt support (from api 1.21) #1131

Merged
merged 1 commit into from
Aug 23, 2016
Merged

Implemented dns_opt support (from api 1.21) #1131

merged 1 commit into from
Aug 23, 2016

Conversation

Knetic
Copy link
Contributor

@Knetic Knetic commented Jul 14, 2016

In the process of making a PR for docker-compose to implement docker-compose:#3184, I realized the python client doesn't support dns_opt. This should fix that.

@shin-
Copy link
Contributor

shin- commented Jul 25, 2016

Thanks, LGTM.

@shin- shin- added this to the 1.10.0 milestone Jul 26, 2016
@fermayo
Copy link
Contributor

fermayo commented Jul 29, 2016

+1

1 similar comment
@EtienneDufresne
Copy link

👍

Signed-off-by: George Lester <glester491@gmail.com>
@Knetic
Copy link
Contributor Author

Knetic commented Aug 7, 2016

Rebased to handle merge conflict

@Knetic
Copy link
Contributor Author

Knetic commented Aug 15, 2016

Is there a date when this might get merged? Not sure if there's like a "merge day" where PRs get pulled in, and I should have this rebased and ready to go. I don't remember to check the rebase status that often.

@shin-
Copy link
Contributor

shin- commented Aug 23, 2016

Hey @Knetic , sorry for the lack of feedback - we usually wait for two maintainers to LGTM a PR before it gets merged, but with the summer months it's a bit difficult to get 2 pairs of eyes on everything.

I've merged it now, since the changes are fairly low-risk and everything checks out. Thank you for your patience!

@shin- shin- merged commit 0acdd19 into docker:master Aug 23, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants