diff options
| author | Reynold Xin <rxin@apache.org> | 2013-11-04 21:02:36 -0800 |
|---|---|---|
| committer | Reynold Xin <rxin@apache.org> | 2013-11-04 21:02:36 -0800 |
| commit | 551a43fd3dfe24beed12961050b58aa0c0379b4c (patch) | |
| tree | 6fd3a8a66b4efce4aa81bae444acc0d5eea1bce1 /examples | |
| parent | 99bfcc91e010ba29852ec7dd0b4270805b7b2377 (diff) | |
| parent | 7a26104ab7cb492b347ba761ef1f17ca1b9078e4 (diff) | |
| download | spark-551a43fd3dfe24beed12961050b58aa0c0379b4c.tar.gz spark-551a43fd3dfe24beed12961050b58aa0c0379b4c.tar.bz2 spark-551a43fd3dfe24beed12961050b58aa0c0379b4c.zip | |
Merge branch 'master' of github.com:apache/incubator-spark into mergemerge
Conflicts:
README.md
core/src/main/scala/org/apache/spark/util/collection/OpenHashMap.scala
core/src/main/scala/org/apache/spark/util/collection/OpenHashSet.scala
core/src/main/scala/org/apache/spark/util/collection/PrimitiveKeyOpenHashMap.scala
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/src/main/scala/org/apache/spark/examples/SparkHdfsLR.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/src/main/scala/org/apache/spark/examples/SparkHdfsLR.scala b/examples/src/main/scala/org/apache/spark/examples/SparkHdfsLR.scala index 646682878f..86dd9ca1b3 100644 --- a/examples/src/main/scala/org/apache/spark/examples/SparkHdfsLR.scala +++ b/examples/src/main/scala/org/apache/spark/examples/SparkHdfsLR.scala @@ -21,6 +21,7 @@ import java.util.Random import scala.math.exp import org.apache.spark.util.Vector import org.apache.spark._ +import org.apache.spark.deploy.SparkHadoopUtil import org.apache.spark.scheduler.InputFormatInfo /** @@ -51,7 +52,7 @@ object SparkHdfsLR { System.exit(1) } val inputPath = args(1) - val conf = SparkEnv.get.hadoop.newConfiguration() + val conf = SparkHadoopUtil.get.newConfiguration() val sc = new SparkContext(args(0), "SparkHdfsLR", System.getenv("SPARK_HOME"), Seq(System.getenv("SPARK_EXAMPLES_JAR")), Map(), InputFormatInfo.computePreferredLocations( |