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

Merge branch 'master' into wip-traversal-oriented-layout-master-patriknw

Browse source
This commit is contained in:
Patrik Nordwall 2017-03-10 18:16:44 +01:00
commit 3554ad7243
25 changed files with 313 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-docs/rst/scala/code/docs/serialization/SerializationDocSpec.scala
View file

@ -25,7 +25,7 @@ package docs.serialization {
// Pick a unique identifier for your Serializer,
// you've got a couple of billions to choose from,
// 0 - 16 is reserved by Akka itself
// 0 - 40 is reserved by Akka itself
def identifier = 1234567
// "toBinary" serializes the given object to an Array of Bytes
@ -58,7 +58,7 @@ package docs.serialization {
// Pick a unique identifier for your Serializer,
// you've got a couple of billions to choose from,
// 0 - 16 is reserved by Akka itself
// 0 - 40 is reserved by Akka itself
def identifier = 1234567
// The manifest (type hint) that will be provided in the fromBinary method

4
akka-docs/rst/scala/code/docs/stream/TwitterStreamQuickstartDocSpec.scala
View file

@ -108,8 +108,8 @@ class TwitterStreamQuickstartDocSpec extends AkkaSpec {
trait HiddenDefinitions {
//#graph-dsl-broadcast
val writeAuthors: Sink[Author, Unit] = ???
val writeHashtags: Sink[Hashtag, Unit] = ???
val writeAuthors: Sink[Author, NotUsed] = ???
val writeHashtags: Sink[Hashtag, NotUsed] = ???
//#graph-dsl-broadcast
}