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

Pull issue 43 merge #222

Merged
merged 8 commits into from
Apr 3, 2013
Merged

Conversation

joshgord
Copy link

@joshgord joshgord commented Apr 3, 2013

Manual merge of #196

abliss and others added 8 commits March 17, 2013 12:46
Splits a compound unit test into to parts.
Uses mockito instead of a bespoke test object.
Removes unused import statements.
Changes the order of the Finally action w.r.t. onComplete/onError.
- Changes finally0 to finallyDo.
- Removes unnecessary subscription-wrapping.
- Handle exceptions in onCompleted/onError
…issue-43-merge

Conflicts:
	rxjava-core/src/main/java/rx/Observable.java
@cloudbees-pull-request-builder

RxJava-pull-requests #73 SUCCESS
This pull request looks good

mattrjacobs added a commit that referenced this pull request Apr 3, 2013
@mattrjacobs mattrjacobs merged commit e036606 into ReactiveX:master Apr 3, 2013
@mattrjacobs mattrjacobs mentioned this pull request Apr 3, 2013
@benjchristensen
Copy link
Member

This finished #43

rickbw pushed a commit to rickbw/RxJava that referenced this pull request Jan 9, 2014
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.

5 participants