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

Cherry pick v1.7 into v2.0 #5115

Merged
merged 2 commits into from Jul 17, 2019
Merged

Cherry pick v1.7 into v2.0 #5115

merged 2 commits into from Jul 17, 2019

Conversation

jbdoumenjou
Copy link
Member

@jbdoumenjou jbdoumenjou commented Jul 17, 2019 •
edited by ldez

What does this PR do?

Cherry pick v1.7 into v2.0:

  • 7db4196 Fixed doc link for AlibabaCloud
  • 92a5738 Allows logs to use local time zone instead of UTC

Skip:

  • a8680a8 Fixes the TLS Mutual Authentication documentation
  • 7e11fa1 Update Docker version.
  • 489b5a6 Format YAML example on user guide
  • 8027e8e Check for multiport services on Global Backend Ingress
  • d35d5bd Update documentation to clarify the default format for logs
  • 8e47bde Clear TLS client headers if TLSMutualAuth is optional
  • 51419a9 Update Slack support channel references to Discourse community forum
  • 32fd52c Use dynamodbav tags to override json tags.
  • 468e4eb Add remarks about Rancher 2

Motivation

Be in sync.

More

  • [ ] Added/updated tests
  • [ ] Added/updated documentation

dduportal and others added 2 commits July 17, 2019 16:42
@dduportal @ldez @jbdoumenjou
Allows logs to use local time zone instead of UTC
542e78d 
Co-authored-by: Ludovic Fernandez <ldez@users.noreply.github.com>
@ddymko @jbdoumenjou
Fixed doc link for AlibabaCloud
a14b01a
@jbdoumenjou jbdoumenjou added status/2-needs-review bot/merge-method-rebase bot/light-review decreases the number of required LGTM from 3 to 1. labels Jul 17, 2019
@traefiker traefiker added this to the 2.0 milestone Jul 17, 2019
@jbdoumenjou jbdoumenjou added this to To review in v2 via automation Jul 17, 2019
ldez
ldez approved these changes Jul 17, 2019
View reviewed changes
Copy link
Member

@ldez ldez 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 merged commit 75aedc8 into traefik:v2.0 Jul 17, 2019
v2 automation moved this from To review to Done Jul 17, 2019
@traefiker traefiker removed bot/light-review decreases the number of required LGTM from 3 to 1. bot/merge-method-rebase status/3-needs-merge labels Jul 17, 2019
@jbdoumenjou jbdoumenjou deleted the cherry-pick-v1.7 branch July 17, 2019 21:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ldez ldez ldez approved these changes

Assignees
No one assigned
Labels
size/S
Projects
No open projects
v2
Done
Milestone
2.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@jbdoumenjou @ldez @traefiker @dduportal @ddymko