Return-Path: <commits-return-20008-archive-asf-public=cust-asf.ponee.io@spark.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id ED2D52004C8
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Mon,  9 May 2016 20:02:30 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id EBD4B1609A8; Mon,  9 May 2016 18:02:30 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 3F71B16099C
	for <archive-asf-public@cust-asf.ponee.io>; Mon,  9 May 2016 20:02:30 +0200 (CEST)
Received: (qmail 3151 invoked by uid 500); 9 May 2016 18:02:29 -0000
Mailing-List: contact commits-help@spark.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@spark.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@spark.apache.org>
List-Post: <mailto:commits@spark.apache.org>
List-Id: <commits.spark.apache.org>
Delivered-To: mailing list commits@spark.apache.org
Received: (qmail 3142 invoked by uid 99); 9 May 2016 18:02:29 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 May 2016 18:02:29 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 4EC23DFBAB; Mon,  9 May 2016 18:02:29 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: andrewor14@apache.org
To: commits@spark.apache.org
Message-Id: <a8d0144948ba404fbe434cd4f9e41e9d@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: spark git commit: [SPARK-15223][DOCS] fix wrongly named config
 reference
Date: Mon,  9 May 2016 18:02:29 +0000 (UTC)
archived-at: Mon, 09 May 2016 18:02:31 -0000

Repository: spark
Updated Branches:
  refs/heads/branch-2.0 6371197c6 -> 1b4e99ff1


[SPARK-15223][DOCS] fix wrongly named config reference

## What changes were proposed in this pull request?

The configuration setting `spark.executor.logs.rolling.size.maxBytes` was changed to `spark.executor.logs.rolling.maxSize` in 1.4 or so.

This commit fixes a remaining reference to the old name in the documentation.

Also the description for `spark.executor.logs.rolling.maxSize` was edited to clearly state that the unit for the size is bytes.

## How was this patch tested?

no tests

Author: Philipp Hoffmann <mail@philipphoffmann.de>

Closes #13001 from philipphoffmann/patch-3.

(cherry picked from commit 65b4ab281efd170c9fad7152629f68eaef7f7088)
Signed-off-by: Andrew Or <andrew@databricks.com>


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

Branch: refs/heads/branch-2.0
Commit: 1b4e99ff1d3a3c3bee08c776e0c62f0f0c35df92
Parents: 6371197
Author: Philipp Hoffmann <mail@philipphoffmann.de>
Authored: Mon May 9 11:02:13 2016 -0700
Committer: Andrew Or <andrew@databricks.com>
Committed: Mon May 9 11:02:23 2016 -0700

----------------------------------------------------------------------
 docs/configuration.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/1b4e99ff/docs/configuration.md
----------------------------------------------------------------------
diff --git a/docs/configuration.md b/docs/configuration.md
index 9191570..d23f0fe 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -296,7 +296,7 @@ Apart from these, the following properties are also available, and may be useful
   <td><code>spark.executor.logs.rolling.maxSize</code></td>
   <td>(none)</td>
   <td>
-    Set the max size of the file by which the executor logs will be rolled over.
+    Set the max size of the file in bytes by which the executor logs will be rolled over.
     Rolling is disabled by default. See <code>spark.executor.logs.rolling.maxRetainedFiles</code>
     for automatic cleaning of old logs.
   </td>
@@ -308,7 +308,7 @@ Apart from these, the following properties are also available, and may be useful
     Set the strategy of rolling of executor logs. By default it is disabled. It can
     be set to "time" (time-based rolling) or "size" (size-based rolling). For "time",
     use <code>spark.executor.logs.rolling.time.interval</code> to set the rolling interval.
-    For "size", use <code>spark.executor.logs.rolling.size.maxBytes</code> to set
+    For "size", use <code>spark.executor.logs.rolling.maxSize</code> to set
     the maximum file size for rolling.
   </td>
 </tr>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org