spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From joshro...@apache.org
Subject spark git commit: [EC2] Update mesos/spark-ec2 branch to branch-1.3
Date Thu, 25 Dec 2014 22:17:25 GMT
Repository: spark
Updated Branches:
  refs/heads/master b6b6393b4 -> ac8278593


[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


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

Branch: refs/heads/master
Commit: ac8278593ea68dd3be8cddf8cd5ce739f163ab84
Parents: b6b6393
Author: Nicholas Chammas <nicholas.chammas@gmail.com>
Authored: Thu Dec 25 14:16:50 2014 -0800
Committer: Josh Rosen <joshrosen@databricks.com>
Committed: Thu Dec 25 14:16:50 2014 -0800

----------------------------------------------------------------------
 ec2/spark_ec2.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/ac827859/ec2/spark_ec2.py
----------------------------------------------------------------------
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py
index c6679f7..485eea4 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)
 


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


Mime
View raw message