From 65d678d89659bd40af4bb88935e7bb4847916e82 Mon Sep 17 00:00:00 2001
From: Ben Christensen <benjchristensen@netflix.com>
Date: Fri, 29 Aug 2014 23:17:05 -0700
Subject: [PATCH] Deprecate ParallelMerge

Removing in 1.0 as it is confusing and rarely useful.
---
 rxjava-core/src/main/java/rx/Observable.java | 4 ++++
 1 file changed, 4 insertions(+)

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 <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);
     }