Repository: spark
Updated Branches:
  refs/heads/master bae4ca3bb -> f05e09b4c


use isRunningLocally rather than runningLocally

runningLocally is deprecated now

Author: CrazyJvm <[email protected]>

Closes #2879 from CrazyJvm/runningLocally and squashes the following commits:

bec0b3e [CrazyJvm] use isRunningLocally rather than runningLocally


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

Branch: refs/heads/master
Commit: f05e09b4c95d799bdda3c3ff7fb76a4cd656415d
Parents: bae4ca3
Author: CrazyJvm <[email protected]>
Authored: Wed Oct 22 00:51:33 2014 -0700
Committer: Reynold Xin <[email protected]>
Committed: Wed Oct 22 00:51:33 2014 -0700

----------------------------------------------------------------------
 core/src/main/scala/org/apache/spark/CacheManager.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/f05e09b4/core/src/main/scala/org/apache/spark/CacheManager.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/CacheManager.scala 
b/core/src/main/scala/org/apache/spark/CacheManager.scala
index d89bb50..80da62c 100644
--- a/core/src/main/scala/org/apache/spark/CacheManager.scala
+++ b/core/src/main/scala/org/apache/spark/CacheManager.scala
@@ -61,7 +61,7 @@ private[spark] class CacheManager(blockManager: BlockManager) 
extends Logging {
           val computedValues = rdd.computeOrReadCheckpoint(partition, context)
 
           // If the task is running locally, do not persist the result
-          if (context.runningLocally) {
+          if (context.isRunningLocally) {
             return computedValues
           }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to