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

Merge current v1.3 to master #1643

Merged
merged 6 commits into from
May 22, 2017
Merged

Merge current v1.3 to master #1643

merged 6 commits into from
May 22, 2017

Conversation

ldez
Copy link
Contributor

@ldez ldez commented May 20, 2017

Description

This PR merges v1.3 to master.

WARNING Don't merge from GitHub.

gsemet and others added 4 commits May 17, 2017 14:59
* Adds some raw.githubusercontent.com links to the kubectl examples to
make following along at home simpler.
* Dedupe the config for rbac so it can just be ommited if not needed.
@ldez ldez added this to the 1.4 milestone May 20, 2017
Copy link
Contributor

@timoreimann timoreimann left a comment

Choose a reason for hiding this comment

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

👍

Copy link
Member

@emilevauge emilevauge left a comment

Choose a reason for hiding this comment

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

Thanks @ldez
LGTM

@ldez ldez merged commit 8ad31d6 into traefik:master May 22, 2017
@ldez ldez deleted the merge-v1_3 branch May 22, 2017 11:20
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.

6 participants