You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sh...@apache.org on 2015/06/11 22:19:03 UTC
spark git commit: [SPARK-8310] [EC2] Updates the master branch EC2
versions
Repository: spark
Updated Branches:
refs/heads/master 1191c3efc -> c8d551d54
[SPARK-8310] [EC2] Updates the master branch EC2 versions
Will send another PR for `branch-1.4`
Author: Shivaram Venkataraman <sh...@cs.berkeley.edu>
Closes #6764 from shivaram/SPARK-8310 and squashes the following commits:
d8cd3b3 [Shivaram Venkataraman] This updates the master branch EC2 versions
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c8d551d5
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c8d551d5
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c8d551d5
Branch: refs/heads/master
Commit: c8d551d546979e126c91925487e30c353185e3ba
Parents: 1191c3e
Author: Shivaram Venkataraman <sh...@cs.berkeley.edu>
Authored: Thu Jun 11 13:18:42 2015 -0700
Committer: Shivaram Venkataraman <sh...@cs.berkeley.edu>
Committed: Thu Jun 11 13:18:42 2015 -0700
----------------------------------------------------------------------
ec2/spark_ec2.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/c8d551d5/ec2/spark_ec2.py
----------------------------------------------------------------------
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py
index 84629cb..58b24ae 100755
--- a/ec2/spark_ec2.py
+++ b/ec2/spark_ec2.py
@@ -51,7 +51,7 @@ else:
raw_input = input
xrange = range
-SPARK_EC2_VERSION = "1.3.1"
+SPARK_EC2_VERSION = "1.4.0"
SPARK_EC2_DIR = os.path.dirname(os.path.realpath(__file__))
VALID_SPARK_VERSIONS = set([
@@ -89,7 +89,7 @@ DEFAULT_SPARK_GITHUB_REPO = "https://github.com/apache/spark"
# Default location to get the spark-ec2 scripts (and ami-list) from
DEFAULT_SPARK_EC2_GITHUB_REPO = "https://github.com/mesos/spark-ec2"
-DEFAULT_SPARK_EC2_BRANCH = "branch-1.3"
+DEFAULT_SPARK_EC2_BRANCH = "branch-1.4"
def setup_external_libs(libs):
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org