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

Deprecate ParallelMerge #1646

Merged
merged 1 commit into from
Aug 30, 2014
Merged

Deprecate ParallelMerge #1646

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions rxjava-core/src/main/java/rx/Observable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2902,7 +2902,9 @@ public final static <T> Observable<T> never() {
* the number of Observables to merge into
* @return an Observable of Observables constrained in number by {@code parallelObservables}
* @see <a href="https://github.com/Netflix/RxJava/wiki/Combining-Observables#parallelmerge">RxJava wiki: parallelMerge</a>
* @deprecated will be removed in 1.0
*/
@Deprecated
public final static <T> Observable<Observable<T>> parallelMerge(Observable<Observable<T>> source, int parallelObservables) {
return OperatorParallelMerge.parallelMerge(source, parallelObservables);
}
Expand Down Expand Up @@ -2931,7 +2933,9 @@ public final static <T> Observable<Observable<T>> parallelMerge(Observable<Obser
* the {@link Scheduler} to run each Observable on
* @return an Observable of Observables constrained in number by {@code parallelObservables}
* @see <a href="https://github.com/Netflix/RxJava/wiki/Combining-Observables#parallelmerge">RxJava wiki: parallelMerge</a>
@deprecated will be removed in 1.0
*/
@Deprecated
public final static <T> Observable<Observable<T>> parallelMerge(Observable<Observable<T>> source, int parallelObservables, Scheduler scheduler) {
return OperatorParallelMerge.parallelMerge(source, parallelObservables, scheduler);
}
Expand Down