aboutsummaryrefslogtreecommitdiff
path: root/docs/configuration.md
diff options
context:
space:
mode:
authorAndy Konwinski <andyk@berkeley.edu>2012-09-16 15:28:52 -0700
committerAndy Konwinski <andyk@berkeley.edu>2012-09-16 15:28:52 -0700
commit52c29071a4ea59493206f5a6f00feefc22941e72 (patch)
treeb205f1673a975be53112259ceaf2cec7976dee17 /docs/configuration.md
parent6765d9727e6e374a8fc6a361c43e3ddc5c8e12db (diff)
downloadspark-52c29071a4ea59493206f5a6f00feefc22941e72.tar.gz
spark-52c29071a4ea59493206f5a6f00feefc22941e72.tar.bz2
spark-52c29071a4ea59493206f5a6f00feefc22941e72.zip
- Add docs/api to .gitignore
- Rework/expand the nav bar with more of the docs site - Removing parts of docs about EC2 and Mesos that differentiate between running 0.5 and before - Merged subheadings from running-on-amazon-ec2.html that are still relevant (i.e., "Using a newer version of Spark" and "Accessing Data in S3") into ec2-scripts.html and deleted running-on-amazon-ec2.html - Added some TODO comments to a few docs - Updated the blurb about AMP Camp - Renamed programming-guide to spark-programming-guide - Fixing typos/etc. in Standalone Spark doc
Diffstat (limited to 'docs/configuration.md')
-rw-r--r--docs/configuration.md2
1 files changed, 0 insertions, 2 deletions
diff --git a/docs/configuration.md b/docs/configuration.md
index ab854de386..0f16676f6d 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -2,8 +2,6 @@
layout: global
title: Spark Configuration
---
-# Spark Configuration
-
Spark is configured primarily through the `conf/spark-env.sh` script. This script doesn't exist in the Git repository, but you can create it by copying `conf/spark-env.sh.template`. Make sure the script is executable.
Inside this script, you can set several environment variables: