You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2013/11/05 19:43:16 UTC
[3/3] git commit: Merge pull request #140 from aarondav/merge-75
Merge pull request #140 from aarondav/merge-75
Manually merge BlockManager refactor #75
PR #75 was unfortunately not cherry-picked into 0.8.0, which caused a build breakage earlier and now again due to later changes being cherry-picked. This merges #75 and replays #139 on top of it. I have confirmed that #75 has made exactly the changes it did on master. So long as all BlockManager patches from master should have gone into branch-0.8, this PR should do the right thing.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/96670e71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/96670e71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/96670e71
Branch: refs/heads/branch-0.8
Commit: 96670e71679dedc2857d430a018f5b9505946bdd
Parents: 0848167 7eaa461
Author: Reynold Xin <rx...@apache.org>
Authored: Tue Nov 5 10:43:10 2013 -0800
Committer: Reynold Xin <rx...@apache.org>
Committed: Tue Nov 5 10:43:10 2013 -0800
----------------------------------------------------------------------
.../org/apache/spark/storage/BlockManager.scala | 458 +++++++------------
1 file changed, 166 insertions(+), 292 deletions(-)
----------------------------------------------------------------------