Merge branch 'master' of github.com:andrewor14/incubator-spark
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/015a510b Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/015a510b Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/015a510b Branch: refs/heads/master Commit: 015a510b0a456d98d791fb2c7dc3c1448f7db2ab Parents: 2a48d71 e3cac47 Author: Andrew Or <andrewo...@gmail.com> Authored: Sun Dec 29 22:03:47 2013 -0800 Committer: Andrew Or <andrewo...@gmail.com> Committed: Sun Dec 29 22:03:47 2013 -0800 ---------------------------------------------------------------------- .../apache/spark/util/collection/AppendOnlyMap.scala | 7 ++++--- .../spark/util/collection/ExternalAppendOnlyMap.scala | 13 +++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/015a510b/core/src/main/scala/org/apache/spark/util/collection/ExternalAppendOnlyMap.scala ----------------------------------------------------------------------
