You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ap...@apache.org on 2014/12/19 23:43:50 UTC

mahout git commit: MAHOUT-1493 fix changelog and remove temporary hardcoded settings from spark-shell

Repository: mahout
Updated Branches:
  refs/heads/master 310534319 -> 0f037cb03


MAHOUT-1493 fix changelog and remove temporary hardcoded settings from spark-shell


Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/0f037cb0
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/0f037cb0
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/0f037cb0

Branch: refs/heads/master
Commit: 0f037cb03e77c09627c36962600e4fb00c4013c8
Parents: 3105343
Author: Andrew Palumbo <ap...@outlook.com>
Authored: Fri Dec 19 17:38:16 2014 -0500
Committer: Andrew Palumbo <ap...@outlook.com>
Committed: Fri Dec 19 17:43:24 2014 -0500

----------------------------------------------------------------------
 CHANGELOG                                                      | 2 +-
 .../apache/mahout/sparkbindings/shell/MahoutSparkILoop.scala   | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mahout/blob/0f037cb0/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index e4f4cae..7b1aa09 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,7 +2,7 @@ Mahout Change Log
 
 Release 1.0 - unreleased
 
-  MAHOUT-1493: MAHOUT-1493 Port Naive Bayes to Scala DSL (apalumbo) 
+  MAHOUT-1493: Port Naive Bayes to Scala DSL (apalumbo) 
 
   MAHOUT-1611: Preconditions.checkArgument in org.apache.mahout.utils.ConcatenateVectorsJob (Haishou Ma via smarthi)
 

http://git-wip-us.apache.org/repos/asf/mahout/blob/0f037cb0/spark-shell/src/main/scala/org/apache/mahout/sparkbindings/shell/MahoutSparkILoop.scala
----------------------------------------------------------------------
diff --git a/spark-shell/src/main/scala/org/apache/mahout/sparkbindings/shell/MahoutSparkILoop.scala b/spark-shell/src/main/scala/org/apache/mahout/sparkbindings/shell/MahoutSparkILoop.scala
index a957786..0df42a3 100644
--- a/spark-shell/src/main/scala/org/apache/mahout/sparkbindings/shell/MahoutSparkILoop.scala
+++ b/spark-shell/src/main/scala/org/apache/mahout/sparkbindings/shell/MahoutSparkILoop.scala
@@ -45,12 +45,6 @@ class MahoutSparkILoop extends SparkILoop {
       conf.set("spark.executor.uri", execUri)
     }
 
-    // temporarily hard code spark.kryoserializer.buffer.mb
-    // to allow for seq2sparse data
-    //TODO: remove this before pushing to apache/master
-    conf.set("spark.kryoserializer.buffer.mb","100")
-    conf.set("spark.akka.frameSize","100")
-
     sparkContext = mahoutSparkContext(
       masterUrl = master,
       appName = "Mahout Spark Shell",