From 293a0b5dbba0474832dc7e9d387f3b10f6c452ea Mon Sep 17 00:00:00 2001
From: GuoQiang Li <witgo@qq.com>
Date: Tue, 14 Oct 2014 22:16:38 -0700
Subject: [SPARK-2098] All Spark processes should support spark-defaults.conf,
 config file

This is another implementation about #1256
cc andrewor14 vanzin

Author: GuoQiang Li <witgo@qq.com>

Closes #2379 from witgo/SPARK-2098-new and squashes the following commits:

4ef1cbd [GuoQiang Li] review commit
49ef70e [GuoQiang Li] Refactor getDefaultPropertiesFile
c45d20c [GuoQiang Li] All Spark processes should support spark-defaults.conf, config file
---
 docs/monitoring.md | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'docs')

diff --git a/docs/monitoring.md b/docs/monitoring.md
index d07ec4a57a..e3f81a76ac 100644
--- a/docs/monitoring.md
+++ b/docs/monitoring.md
@@ -77,6 +77,13 @@ follows:
     one implementation, provided by Spark, which looks for application logs stored in the
     file system.</td>
   </tr>
+  <tr>
+    <td>spark.history.fs.logDirectory</td>
+    <td>(none)</td>
+    <td>
+     Directory that contains application event logs to be loaded by the history server
+    </td>
+  </tr>
   <tr>
     <td>spark.history.fs.updateInterval</td>
     <td>10</td>
-- 
cgit v1.2.3