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

Upgrade to nginx 1.11.10 #732

Merged
merged 1 commit into from
Feb 21, 2017

Conversation

@matt-hh
Copy link
Contributor Author

matt-hh commented Feb 20, 2017

Both tests work on my local machine (Docker version 1.13.1).

$ make test

test_dockergen/test_dockergen_v3.py::test_unknown_virtual_host_is_503 PASSED
test_dockergen/test_dockergen_v3.py::test_forwards_to_whoami PASSED

@thomasleveil Can you help please?

@thomasleveil
Copy link
Contributor

@matt-hh tests also pass on my machine. There is nothing to worry about with your changes. I guess the retry mechanism I implemented on the test suite isn't suited for all cases, I'll see what I can do.

In the meantime, this PR is safe to merge.

If you want to force Travis-CI to build this PR again, you could make a minor change (like whitespace change, typo fix, ...) in your code, git commit --amend and then git push origin feature/upgrade-1.11.10:feature/upgrade-1.11.10 --force to update the PR.

@thomasleveil
Copy link
Contributor

@matt-hh bad luck Travis CI had network issues this time :/

@matt-hh
Copy link
Contributor Author

matt-hh commented Feb 21, 2017

@thomasleveil It works now... Thank you for your help.

@jwilder jwilder merged commit 6554a1c into nginx-proxy:master Feb 21, 2017
@jwilder
Copy link
Collaborator

jwilder commented Feb 21, 2017

Thanks @matt-hh!

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.

None yet

3 participants