Skip to content

Revert timeout property name change#675

Merged
mattrjacobs merged 2 commits intoNetflix:masterfrom
mattrjacobs:revert-timeout-property-name-change
Feb 13, 2015
Merged

Revert timeout property name change#675
mattrjacobs merged 2 commits intoNetflix:masterfrom
mattrjacobs:revert-timeout-property-name-change

Conversation

@mattrjacobs
Copy link
Copy Markdown
Contributor

Revert #664 in favor of a similar approach which does not attempt to migrate the property name.

Matt Jacobs added 2 commits February 12, 2015 13:44
…n.timeoutInMilliseconds)"

This reverts commit 60e47c1.
…or of exectionTimeout.

* Leaving propertry name alone, as this is fairly invasive and harder to deprecate
@cloudbees-pull-request-builder
Copy link
Copy Markdown

NetflixOSS » Hystrix » Hystrix-pull-requests #39 SUCCESS
This pull request looks good

mattrjacobs added a commit that referenced this pull request Feb 13, 2015
…-change

Revert timeout property name change
@mattrjacobs mattrjacobs merged commit 50859ff into Netflix:master Feb 13, 2015
@mattrjacobs mattrjacobs deleted the revert-timeout-property-name-change branch February 13, 2015 00:28
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.

2 participants