!str #15089 add flatMapMerge

2015-12-01 18:03:30 +01:00 · 2015-12-01 18:03:30 +01:00 · 073e7058dc
commit 073e7058dc
parent 3f3f5c8575
13 changed files with 485 additions and 74 deletions
--- a/akka-stream/src/main/scala/akka/stream/impl/ActorMaterializerImpl.scala
+++ b/akka-stream/src/main/scala/akka/stream/impl/ActorMaterializerImpl.scala
@ -262,7 +262,6 @@ private[akka] object ActorProcessorFactory {
      case GroupBy(f, _)         ⇒ (GroupByProcessorImpl.props(settings, f), ())
      case PrefixAndTail(n, _)   ⇒ (PrefixAndTailImpl.props(settings, n), ())
      case Split(d, _)           ⇒ (SplitWhereProcessorImpl.props(settings, d), ())
-      case ConcatAll(f, _)       ⇒ (ConcatAllImpl.props(f, materializer), ())
      case DirectProcessor(p, m) ⇒ throw new AssertionError("DirectProcessor cannot end up in ActorProcessorFactory")
    }
  }