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

Merge pull request #20070 from akka/wip-random-findings-RK

Browse source 
some random findings
This commit is contained in:
Konrad Malawski 2016-03-24 20:24:42 +01:00
commit aff158cb98
9 changed files with 26 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-docs/rst/scala/code/docs/ddata/TwoPhaseSet.scala
View file

@ -19,7 +19,7 @@ case class TwoPhaseSet(
def remove(element: String): TwoPhaseSet =
copy(removals = removals.add(element))
def elements: Set[String] = adds.elements -- removals.elements
def elements: Set[String] = adds.elements diff removals.elements
override def merge(that: TwoPhaseSet): TwoPhaseSet =
copy(

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

@ -32,8 +32,7 @@ object TwitterStreamQuickstartDocSpec {
//#model
//#tweet-source
val tweets: Source[Tweet, NotUsed]
//#tweet-source
val tweets: Source[Tweet, NotUsed] //#tweet-source
= Source(
Tweet(Author("rolandkuhn"), System.currentTimeMillis, "#akka rocks!") ::
Tweet(Author("patriknw"), System.currentTimeMillis, "#akka !") ::