Merge pull request #228 from pwendell/master Document missing configs and set shuffle consolidation to false.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/5d460253 Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/5d460253 Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/5d460253 Branch: refs/heads/scala-2.10 Commit: 5d460253d6080d871cb71efb112ea17be0873771 Parents: 72b6961 75d161b Author: Patrick Wendell <[email protected]> Authored: Thu Dec 5 12:31:24 2013 -0800 Committer: Patrick Wendell <[email protected]> Committed: Thu Dec 5 12:31:24 2013 -0800 ---------------------------------------------------------------------- .../spark/storage/ShuffleBlockManager.scala | 2 +- .../spark/storage/DiskBlockManagerSuite.scala | 14 ++++++-- docs/configuration.md | 37 +++++++++++++++++++- 3 files changed, 49 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
