diff --git a/rxjava-core/src/main/java/rx/Observable.java b/rxjava-core/src/main/java/rx/Observable.java index 89eaf539d1..1e363aff18 100644 --- a/rxjava-core/src/main/java/rx/Observable.java +++ b/rxjava-core/src/main/java/rx/Observable.java @@ -2902,7 +2902,9 @@ public final static Observable never() { * the number of Observables to merge into * @return an Observable of Observables constrained in number by {@code parallelObservables} * @see RxJava wiki: parallelMerge + * @deprecated will be removed in 1.0 */ + @Deprecated public final static Observable> parallelMerge(Observable> source, int parallelObservables) { return OperatorParallelMerge.parallelMerge(source, parallelObservables); } @@ -2931,7 +2933,9 @@ public final static Observable> parallelMerge(ObservableRxJava wiki: parallelMerge + @deprecated will be removed in 1.0 */ + @Deprecated public final static Observable> parallelMerge(Observable> source, int parallelObservables, Scheduler scheduler) { return OperatorParallelMerge.parallelMerge(source, parallelObservables, scheduler); }