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

Concat merge #223

Merged
merged 6 commits into from
Apr 18, 2013
Merged

Concat merge #223

merged 6 commits into from
Apr 18, 2013

Conversation

billyy
Copy link
Contributor

@billyy billyy commented Apr 4, 2013

  1. Update javadoc on subscribe() blocking if observables are running on the same thread.
  2. Add test case with infinity observable.
  3. Add test case to unsubscribe() with all observables running in different thread (non-blocking).

abliss and others added 6 commits March 22, 2013 23:21
@abliss
Reimplementation of Concat, improved handling of Observable<Observabl…
f81c0ac 
…e<T>>.

The old version required all of the Observable<T>s to be generated and buffered
before the concat could begin.  If the outer Observable was asynchronous, items
could be dropped (test added).  The new version passes the test, and does the
best job I could (after examining several possible strategies) of achieving
clear and consistent semantics in accordance with the principle of least
surprise.
@abliss
Incorporate review feedback.
8e179a1 
Also restore the errant change to settings.gradle.
@abliss
Merge branch 'upstream' into issue202
dbf1cb4
@abliss
Merge branch 'master' of git://github.com/Netflix/RxJava into issue202
b15f257
@billyy
Merge branch 'issue202' of https://github.com/abliss/RxJava into conc…
f2e4e81 
…at-merge
@billyy
1. Update javadoc on subscribe() blocking if observables are running …
61e6eb9 
…on the same thread.

2.  Add test case with infinity observable.
3.  Add test case to unsubscribe() with all observables running in different thread (non-blocking).
@cloudbees-pull-request-builder
Copy link

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

@benjchristensen
Copy link
Member

Is this all good to go now @billyy and @abliss ? Are you both happy with its conformance to the .Net implementation and the various use cases we discussed on previous pull requests?

benjchristensen added a commit that referenced this pull request Apr 18, 2013
@benjchristensen
Merge pull request #223 from billyy/concat-merge
ce65cca 
Concat merge
@benjchristensen benjchristensen merged commit ce65cca into ReactiveX:master Apr 18, 2013
@benjchristensen
Copy link
Member

This fixed #202

rickbw pushed a commit to rickbw/RxJava that referenced this pull request Jan 9, 2014
@benjchristensen
Merge pull request ReactiveX#223 from billyy/concat-merge
fb4d530 
Concat merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@billyy @cloudbees-pull-request-builder @benjchristensen @abliss