Merge pull request #1646 from benjchristensen/deprecate-parallel-merge

Deprecate ParallelMerge
ReactiveX · Aug 30, 2014 · c6a23fa · c6a23fa
2 parents 362aee9 + 65d678d
commit c6a23fa
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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 <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);
     }
@@ -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);
     }