Undid some changes that Mosharaf inadvertedly committed to master.

figo · Oct 19, 2010 · 0e0ec83 · 0e0ec83
1 parent bf7055d
commit 0e0ec83
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/conf/java-opts.template b/conf/java-opts.template
@@ -1 +0,0 @@
--Dspark.broadcast.masterHostAddress=127.0.0.1 -Dspark.broadcast.masterTrackerPort=11111 -Dspark.broadcast.blockSize=1024 -Dspark.broadcast.maxRetryCount=2 -Dspark.broadcast.serverSocketTimout=50000 -Dspark.broadcast.dualMode=false

diff --git a/conf/spark-env.sh.template b/conf/spark-env.sh.template
@@ -10,4 +10,4 @@
 #   be in the same format as the JVM's -Xmx option, e.g. 300m or 1g).
 # - SPARK_LIBRARY_PATH, to add extra search paths for native libraries.
 
-MESOS_HOME=/home/mosharaf/Work/mesos
+
diff --git a/src/scala/spark/Broadcast.scala b/src/scala/spark/Broadcast.scala
@@ -223,7 +223,7 @@ private object Broadcast {
         // Initialization for CentralizedHDFSBroadcast
         BroadcastCH.initialize 
         // Initialization for ChainedStreamingBroadcast
-        BroadcastCS.initialize (isMaster)
+        // BroadcastCS.initialize (isMaster)
 
         initialized = true
       }
Original file line number	Diff line number	Diff line change
		@@ -1 +0,0 @@
		-Dspark.broadcast.masterHostAddress=127.0.0.1 -Dspark.broadcast.masterTrackerPort=11111 -Dspark.broadcast.blockSize=1024 -Dspark.broadcast.maxRetryCount=2 -Dspark.broadcast.serverSocketTimout=50000 -Dspark.broadcast.dualMode=false
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,4 @@
		# be in the same format as the JVM's -Xmx option, e.g. 300m or 1g).
		# - SPARK_LIBRARY_PATH, to add extra search paths for native libraries.

		MESOS_HOME=/home/mosharaf/Work/mesos