Skip to content

Cherry pick v1.7 into master #4206

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
traefiker merged 11 commits into from
Nov 19, 2018
Merged

Cherry pick v1.7 into master #4206

traefiker merged 11 commits into from
Nov 19, 2018

Conversation

@ldez
Copy link
Contributor

@ldez ldez commented Nov 19, 2018 •
edited
Loading

What does this PR do?

Cherry pick v1.7 into master:

  • Support canary weight for external name service #4135
  • fix: ACME spec and Cloudflare. #4201
  • Allow usersFile comments #4159
  • Remove X-Forwarded-Uri and X-Forwarded-Method from untrusted IP #4036
  • Verify ctx when we send configuration message in docker provider #4185
  • Query params in health check #4188
  • Upgraded DD APM library #4189
  • Fix ssl force host secure middleware #4138
  • ACME DNS provider is called acme-dns #4166
  • Clarify swarm loadbalancer documentation #4194
  • Fix spelling in comment #4169
  • Improve kubernetes TLS user guide #4175
  • frame-deny should be set to true to enable the header #4171
  • Include an explicit list of kubernetes protocol annotations in docs. #4170
  • Documentation: Rename "admin panel" to "dashboard #4156

Motivation

Be sync.

More

  • Added/updated tests
  • Added/updated documentation

@ldez ldez added status/2-needs-review bot/light-review decreases the number of required LGTM from 3 to 1. labels Nov 19, 2018
@ldez ldez added this to the next milestone Nov 19, 2018
@ldez ldez requested review from a team as code owners November 19, 2018 10:27
@ldez ldez removed request for a team November 19, 2018 10:27
@ldez ldez added the bot/light-review decreases the number of required LGTM from 3 to 1. label Nov 19, 2018
mmatur
mmatur approved these changes Nov 19, 2018
View reviewed changes
Copy link
Member

@mmatur mmatur left a comment

Choose a reason for hiding this comment

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

LGTM

dtomcej
dtomcej approved these changes Nov 19, 2018
View reviewed changes
Copy link
Contributor

@dtomcej dtomcej left a comment

Choose a reason for hiding this comment

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

LGTM
:shipit:

@traefiker traefiker merged commit b6498cd into traefik:master Nov 19, 2018
@traefiker traefiker removed bot/light-review decreases the number of required LGTM from 3 to 1. status/3-needs-merge labels Nov 19, 2018
This was referenced Nov 19, 2018
Merged
Closed
@ldez ldez deleted the feature/cherry-pick-v1.7 branch November 19, 2018 23:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mmatur mmatur mmatur approved these changes

+1 more reviewer

@dtomcej dtomcej dtomcej approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

size/M

Projects

None yet

Milestone

2.0

Development

Successfully merging this pull request may close these issues.