aboutsummaryrefslogtreecommitdiff
path: root/ec2
diff options
context:
space:
mode:
authorNicholas Chammas <nicholas.chammas@gmail.com>2014-12-25 14:16:50 -0800
committerJosh Rosen <joshrosen@databricks.com>2014-12-25 14:16:50 -0800
commitac8278593ea68dd3be8cddf8cd5ce739f163ab84 (patch)
treed96e5585cdc8ae48bc1f4c045d72fd2b491acfee /ec2
parentb6b6393b477baa7246e2c7c4942b30c14cb05fa4 (diff)
downloadspark-ac8278593ea68dd3be8cddf8cd5ce739f163ab84.tar.gz
spark-ac8278593ea68dd3be8cddf8cd5ce739f163ab84.tar.bz2
spark-ac8278593ea68dd3be8cddf8cd5ce739f163ab84.zip
[EC2] Update mesos/spark-ec2 branch to branch-1.3
Going forward, we'll use matching branch names across the mesos/spark-ec2 and apache/spark repositories, per [the discussion here](https://github.com/mesos/spark-ec2/pull/85#issuecomment-68069589). Author: Nicholas Chammas <nicholas.chammas@gmail.com> Closes #3804 from nchammas/patch-2 and squashes the following commits: cd2c0d4 [Nicholas Chammas] [EC2] Update mesos/spark-ec2 branch to branch-1.3
Diffstat (limited to 'ec2')
-rwxr-xr-xec2/spark_ec2.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py
index c6679f7a0b..485eea4f5e 100755
--- a/ec2/spark_ec2.py
+++ b/ec2/spark_ec2.py
@@ -42,7 +42,7 @@ from sys import stderr
DEFAULT_SPARK_VERSION = "1.2.0"
SPARK_EC2_DIR = os.path.dirname(os.path.realpath(__file__))
-MESOS_SPARK_EC2_BRANCH = "v4"
+MESOS_SPARK_EC2_BRANCH = "branch-1.3"
# A URL prefix from which to fetch AMI information
AMI_PREFIX = "https://raw.github.com/mesos/spark-ec2/{b}/ami-list".format(b=MESOS_SPARK_EC2_BRANCH)