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.

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

Merge current v1.4 into master #2469

Merged
merged 2 commits into from
Nov 27, 2017
Merged

Merge current v1.4 into master #2469

merged 2 commits into from
Nov 27, 2017

Conversation

ldez
Copy link
Contributor

@ldez ldez commented Nov 27, 2017

What does this PR do?

Merge current v1.4 into master

Motivation

Be sync.

@ldez ldez added bot/light-review decreases the number of required LGTM from 3 to 1. status/2-needs-review labels Nov 27, 2017
@ldez ldez added this to the 1.5 milestone Nov 27, 2017
@ldez ldez requested a review from a team as a code owner November 27, 2017 10:42
mmatur
mmatur approved these changes Nov 27, 2017
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

@traefiker traefiker removed bot/light-review decreases the number of required LGTM from 3 to 1. bot/merge-method-ff status/3-needs-merge labels Nov 27, 2017
@traefiker traefiker merged commit 9f6f637 into traefik:master Nov 27, 2017
@ldez ldez deleted the mrg-current-1.4 branch November 27, 2017 16:05
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

@traefiker traefiker traefiker approved these changes

Assignees
No one assigned
Labels
size/S
Projects
None yet
Milestone
1.5
Development

Successfully merging this pull request may close these issues.
4 participants
@ldez @mmatur @traefiker @cheungpat