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

Fix default timeouts for Marathon provider. #1398

Merged
merged 1 commit into from
Apr 20, 2017

Conversation

timoreimann
Copy link
Contributor

The timeouts were given without a unit, which caused nanoseconds scale to be applied when we switched the type from int to flaeg.Duration.

Fixes a regression introduced by #1350.

Discovered along #1390.

@timoreimann timoreimann changed the title Fix default timeouts for Marathon provider. [WIP] Fix default timeouts for Marathon provider. Apr 7, 2017
@timoreimann
Copy link
Contributor Author

Marking WIP because I still want to add an integration test.

@timoreimann timoreimann force-pushed the fix-default-timeouts-for-marathon-provider branch from b7b166f to 788b661 Compare April 7, 2017 11:31
@timoreimann timoreimann added this to the 1.3 milestone Apr 7, 2017
@timoreimann timoreimann force-pushed the fix-default-timeouts-for-marathon-provider branch 3 times, most recently from ce23287 to 717cf17 Compare April 10, 2017 07:29
@timoreimann
Copy link
Contributor Author

I went down a huge rabbit hole trying to add an integration test. I decided to carve out the test into a separate PR #1406 and reduced this one.

@emilevauge can we approve the PR without the extended test for now? I'd like the fix to be in first, will continue to work on the test.

@timoreimann timoreimann changed the title [WIP] Fix default timeouts for Marathon provider. Fix default timeouts for Marathon provider. Apr 10, 2017
@timoreimann
Copy link
Contributor Author

Ping @emilevauge

@timoreimann timoreimann force-pushed the fix-default-timeouts-for-marathon-provider branch from 717cf17 to bededab Compare April 12, 2017 23:51
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.

LGTM

@timoreimann timoreimann force-pushed the fix-default-timeouts-for-marathon-provider branch 2 times, most recently from a9594e2 to 360e8e1 Compare April 19, 2017 23:50
The timeouts were given without a unit, which caused nanoseconds scale
to be applied when we switched the type from int to flaeg.Duration.
@trecloux
Copy link
Contributor

LGTM

@vdemeester vdemeester merged commit 9c9015a into master Apr 20, 2017
@vdemeester vdemeester deleted the fix-default-timeouts-for-marathon-provider branch April 20, 2017 06:37
@ldez ldez added kind/bug/fix a bug fix and removed bug labels Apr 25, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants