raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

fixed merge conflicts, fixed reducebykey

Browse source
This commit is contained in:
Endre Sándor Varga 2014-12-19 11:39:41 +01:00
parent 2c01bed1a7
commit 7a75965270
5 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-docs-dev/rst/scala/code/docs/stream/cookbook/RecipeKeepAlive.scala
View file

@ -28,7 +28,7 @@ class RecipeKeepAlive extends RecipeSpec {
import FlowGraphImplicits._
val graph = FlowGraph { implicit builder =>
val unfairMerge = MergePreferred[ByteString]("keepAliveInjector")
val unfairMerge = MergePreferred[ByteString]
dataStream ~> unfairMerge.preferred // If data is available then no keepalive is injected
keepAliveStream ~> unfairMerge