aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorTathagata Das <tathagata.das1565@gmail.com>2013-02-20 11:06:01 -0800
committerTathagata Das <tathagata.das1565@gmail.com>2013-02-20 11:06:01 -0800
commit972fe7714fb57385d14e4d776f70e0040d3a8f7e (patch)
tree5b16bdd3dd1b2bff6a8fea51a351fd6bd5fb28cc /examples
parent334ab9244113e4b792fd51697ef80ab0d3b3de25 (diff)
parent991d3342fed1cf5626142bc90872f79618ea94c8 (diff)
downloadspark-972fe7714fb57385d14e4d776f70e0040d3a8f7e.tar.gz
spark-972fe7714fb57385d14e4d776f70e0040d3a8f7e.tar.bz2
spark-972fe7714fb57385d14e4d776f70e0040d3a8f7e.zip
Merge branch 'mesos-streaming' into streaming
Conflicts: streaming/src/test/java/spark/streaming/JavaAPISuite.java
Diffstat (limited to 'examples')
-rw-r--r--examples/src/main/scala/spark/streaming/examples/ActorWordCount.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/src/main/scala/spark/streaming/examples/ActorWordCount.scala b/examples/src/main/scala/spark/streaming/examples/ActorWordCount.scala
index 71b4e5bf1a..346151c147 100644
--- a/examples/src/main/scala/spark/streaming/examples/ActorWordCount.scala
+++ b/examples/src/main/scala/spark/streaming/examples/ActorWordCount.scala
@@ -147,7 +147,7 @@ object ActorWordCount {
*/
val lines = ssc.actorStream[String](
- Props(new SampleActorReceiver[String]("akka://spark@%s:%s/user/FeederActor".format(
+ Props(new SampleActorReceiver[String]("akka://test@%s:%s/user/FeederActor".format(
host, port.toInt))), "SampleReceiver")
//compute wordcount