aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorImran Rashid <imran@quantifind.com>2013-02-01 00:20:49 -0800
committerImran Rashid <imran@quantifind.com>2013-02-01 00:20:49 -0800
commitf127f2ae76692b189d86b5a47293579d5657c6d5 (patch)
tree2d15753b76dc7cd68eb4a5f89e7c76703d09ba77
parent02a6761589c35f15f1a6e3b63a7964ba057d3ba6 (diff)
downloadspark-f127f2ae76692b189d86b5a47293579d5657c6d5.tar.gz
spark-f127f2ae76692b189d86b5a47293579d5657c6d5.tar.bz2
spark-f127f2ae76692b189d86b5a47293579d5657c6d5.zip
fixup merge (master -> driver renaming)
-rw-r--r--core/src/main/scala/spark/storage/BlockManagerMaster.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/scala/spark/storage/BlockManagerMaster.scala b/core/src/main/scala/spark/storage/BlockManagerMaster.scala
index 99324445ca..0372cb080a 100644
--- a/core/src/main/scala/spark/storage/BlockManagerMaster.scala
+++ b/core/src/main/scala/spark/storage/BlockManagerMaster.scala
@@ -118,7 +118,7 @@ private[spark] class BlockManagerMaster(
}
def getStorageStatus: Array[StorageStatus] = {
- askMasterWithRetry[ArrayBuffer[StorageStatus]](GetStorageStatus).toArray
+ askDriverWithReply[ArrayBuffer[StorageStatus]](GetStorageStatus).toArray
}
/** Stop the driver actor, called only on the Spark driver node */