Return-Path: X-Original-To: apmail-spark-commits-archive@minotaur.apache.org Delivered-To: apmail-spark-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0F76910982 for ; Sat, 11 Jan 2014 00:25:44 +0000 (UTC) Received: (qmail 71648 invoked by uid 500); 11 Jan 2014 00:25:44 -0000 Delivered-To: apmail-spark-commits-archive@spark.apache.org Received: (qmail 71625 invoked by uid 500); 11 Jan 2014 00:25:44 -0000 Mailing-List: contact commits-help@spark.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@spark.incubator.apache.org Delivered-To: mailing list commits@spark.incubator.apache.org Received: (qmail 71618 invoked by uid 99); 11 Jan 2014 00:25:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Jan 2014 00:25:43 +0000 X-ASF-Spam-Status: No, hits=-2000.1 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 11 Jan 2014 00:25:40 +0000 Received: (qmail 71151 invoked by uid 99); 11 Jan 2014 00:25:18 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Jan 2014 00:25:18 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C6BBD32AED4; Sat, 11 Jan 2014 00:25:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pwendell@apache.org To: commits@spark.incubator.apache.org Date: Sat, 11 Jan 2014 00:25:40 -0000 Message-Id: <2ae5c75e5b47448cae721b3fe9d3c292@git.apache.org> In-Reply-To: <9d3acd2661a24b3b8e4e0579d5e9e819@git.apache.org> References: <9d3acd2661a24b3b8e4e0579d5e9e819@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [23/50] git commit: Merge branch 'master' of github.com:andrewor14/incubator-spark X-Virus-Checked: Checked by ClamAV on apache.org 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 Authored: Sun Dec 29 22:03:47 2013 -0800 Committer: Andrew Or 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 ----------------------------------------------------------------------