diff options
| author | Reynold Xin <rxin@cs.berkeley.edu> | 2013-05-07 15:56:19 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@cs.berkeley.edu> | 2013-05-07 15:56:19 -0700 |
| commit | 90577ada691f43be875c9d2ff4aaef962727f34d (patch) | |
| tree | 7cd6238e22bcd87f118368ef21bccdce246496a9 /streaming/src | |
| parent | aacca1b8a85bd073ce185a06d6470b070761b2f4 (diff) | |
| parent | b493f55a4fe43c83061a361eef029edbac50c006 (diff) | |
| download | spark-90577ada691f43be875c9d2ff4aaef962727f34d.tar.gz spark-90577ada691f43be875c9d2ff4aaef962727f34d.tar.bz2 spark-90577ada691f43be875c9d2ff4aaef962727f34d.zip | |
Merge branch 'shuffle-performance-fix-0.7' of github.com:shane-huang/spark into shufflemerge
Conflicts:
core/src/main/scala/spark/storage/BlockManager.scala
core/src/main/scala/spark/storage/DiskStore.scala
project/SparkBuild.scala
Diffstat (limited to 'streaming/src')
| -rw-r--r-- | streaming/src/main/scala/spark/streaming/util/RawTextSender.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/streaming/src/main/scala/spark/streaming/util/RawTextSender.scala b/streaming/src/main/scala/spark/streaming/util/RawTextSender.scala index d8b987ec86..bd0b0e74c1 100644 --- a/streaming/src/main/scala/spark/streaming/util/RawTextSender.scala +++ b/streaming/src/main/scala/spark/streaming/util/RawTextSender.scala @@ -5,7 +5,7 @@ import spark.util.{RateLimitedOutputStream, IntParam} import java.net.ServerSocket import spark.{Logging, KryoSerializer} import it.unimi.dsi.fastutil.io.FastByteArrayOutputStream -import io.Source +import scala.io.Source import java.io.IOException /** |