Return-Path: 
 <commits-return-1570-apmail-spark-commits-archive=spark.apache.org@spark.incubator.apache.org>
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 1680910CE6
	for <apmail-spark-commits-archive@minotaur.apache.org>;
 Sat,  7 Dec 2013 04:17:15 +0000 (UTC)
Received: (qmail 43541 invoked by uid 500); 7 Dec 2013 04:17:03 -0000
Delivered-To: apmail-spark-commits-archive@spark.apache.org
Received: (qmail 43496 invoked by uid 500); 7 Dec 2013 04:16:58 -0000
Mailing-List: contact commits-help@spark.incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@spark.incubator.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@spark.incubator.apache.org>
List-Post: <mailto:commits@spark.incubator.apache.org>
List-Id: <commits.spark.incubator.apache.org>
Reply-To: dev@spark.incubator.apache.org
Delivered-To: mailing list commits@spark.incubator.apache.org
Received: (qmail 43487 invoked by uid 99); 7 Dec 2013 04:16:55 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 Dec 2013 04:16:55 +0000
X-ASF-Spam-Status: No, hits=-2000.0 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, 07 Dec 2013 04:16:53 +0000
Received: (qmail 43345 invoked by uid 99); 7 Dec 2013 04:16:31 -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, 07 Dec 2013 04:16:31 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id A29A48A7A66; Sat,  7 Dec 2013 04:16:30 +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, 07 Dec 2013 04:16:30 -0000
Message-Id: <10729200aff6451ca9b46ecdc10109f1@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/2] git commit: Adding disclaimer for shuffle file consolidation
X-Virus-Checked: Checked by ClamAV on apache.org

Updated Branches:
  refs/heads/master e5d5728b7 -> 1b38f5f27


Adding disclaimer for shuffle file consolidation


Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/b9451acd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/b9451acd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/b9451acd

Branch: refs/heads/master
Commit: b9451acdf4c73ab4b0b9d9827ab1ccedbcfb144f
Parents: 241336a
Author: Patrick Wendell <pwendell@gmail.com>
Authored: Fri Dec 6 19:25:28 2013 -0800
Committer: Patrick Wendell <pwendell@gmail.com>
Committed: Fri Dec 6 19:25:28 2013 -0800

----------------------------------------------------------------------
 docs/configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/b9451acd/docs/configuration.md
----------------------------------------------------------------------
diff --git a/docs/configuration.md b/docs/configuration.md
index 22abe1c..65b41b4 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -331,7 +331,7 @@ Apart from these, the following properties are also available, and may be useful
   <td>spark.shuffle.consolidateFiles</td>
   <td>false</td>
   <td>
-    If set to "true", consolidates intermediate files created during a shuffle. Creating fewer files can improve filesystem performance if you run shuffles with large numbers of reduce tasks.
+    If set to "true", consolidates intermediate files created during a shuffle. Creating fewer files can improve filesystem performance for shuffles with large numbers of reduce tasks. It is reccomended to set this to "true" when using ext4 or xfs filesystems. On ext3, this option might degrade performance on machines with many (>8) cores due to filesystem limitations.
   </td>
 </tr>
 <tr>