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

Added the rest overloads of Timeout operator #463

Merged
merged 1 commit into from
Nov 12, 2013

Conversation

zsxwing
Copy link
Member

@zsxwing zsxwing commented Nov 3, 2013

Hi, this PR implemented the rest overloads of Timeout operator #91. Please take a look. Thanks.

@cloudbees-pull-request-builder

RxJava-pull-requests #383 FAILURE
Looks like there's a problem with this pull request

@benjchristensen
Copy link
Member

Due to pull request #466 which touched virtually every file in the project can you please rebase this so it can merge cleanly again?

@cloudbees-pull-request-builder

RxJava-pull-requests #388 FAILURE
Looks like there's a problem with this pull request

@zsxwing
Copy link
Member Author

zsxwing commented Nov 5, 2013

I have rebased it.

benjchristensen added a commit that referenced this pull request Nov 12, 2013
Added the rest overloads of Timeout operator
@benjchristensen benjchristensen merged commit 0b160cb into ReactiveX:master Nov 12, 2013
@benjchristensen
Copy link
Member

Thank you @zsxwing

@zsxwing zsxwing deleted the timeout-overload branch November 13, 2013 02:37
rickbw pushed a commit to rickbw/RxJava that referenced this pull request Jan 9, 2014
Added the rest overloads of Timeout operator
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.

3 participants