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 v1.2.0 rc2 master #1208

Merged
merged 15 commits into from
Mar 6, 2017
Merged

Merge v1.2.0 rc2 master #1208

merged 15 commits into from
Mar 6, 2017

Conversation

emilevauge
Copy link
Member

This PR merge v1.2 branch into master.
@timoreimann, this one is for you ;)

@timoreimann
Copy link
Contributor

you're making both master and @timoreimann happy. :-)

@emilevauge
Copy link
Member Author

ping @containous/traefik

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:

emilevauge and others added 15 commits March 6, 2017 17:45
Signed-off-by: Emile Vauge <emile@vauge.com>
Signed-off-by: Emile Vauge <emile@vauge.com>
Signed-off-by: Emile Vauge <emile@vauge.com>
Added information about how AWS credentials are resolved and which
access rights is needed the Traefik ECS provider.
Signed-off-by: Emile Vauge <emile@vauge.com>
…if there is a health check defined on it"

This reverts commit ad12a72.
Signed-off-by: Emile Vauge <emile@vauge.com>
@emilevauge emilevauge merged commit 7d83027 into master Mar 6, 2017
@emilevauge emilevauge mentioned this pull request Apr 4, 2017
@vdemeester vdemeester deleted the merge-v1.2.0-rc2-master branch April 4, 2017 17:26
@ldez ldez modified the milestone: 1.3 May 19, 2017
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.

7 participants