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

Handle quoted strings in UnmarshalJSON #3004

Merged
merged 1 commit into from Mar 12, 2018
Merged

Handle quoted strings in UnmarshalJSON #3004

merged 1 commit into from Mar 12, 2018

Conversation

juliens
Copy link
Member

@juliens juliens commented Mar 12, 2018 •
edited by ldez

What does this PR do?

MarshalJSON use int value of time.Duration
UnmarshalJSON handle int value and string (go duration format)

Motivation

Fix a bug when Marshalling / Unmarshalling JSON

@juliens juliens added status/2-needs-review kind/bug/fix a bug fix bot/light-review decreases the number of required LGTM from 3 to 1. labels Mar 12, 2018
@traefiker traefiker added this to the 1.5 milestone Mar 12, 2018
ldez
ldez approved these changes Mar 12, 2018
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 e2b42ca into traefik:v1.5 Mar 12, 2018
@traefiker traefiker removed bot/light-review decreases the number of required LGTM from 3 to 1. status/3-needs-merge labels Mar 12, 2018
@gozer gozer mentioned this pull request Apr 11, 2018
Closed
@juliens juliens deleted the maj-flaeg branch April 18, 2018 09:03
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
kind/bug/fix a bug fix size/S
Projects
None yet
Milestone
1.5
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@juliens @ldez @traefiker