You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/09/24 20:34:54 UTC
git commit: [SPARK-3659] Set EC2 version to 1.1.0 and update version
map
Repository: spark
Updated Branches:
refs/heads/master c42912606 -> 50f863365
[SPARK-3659] Set EC2 version to 1.1.0 and update version map
This brings the master branch in sync with branch-1.1
Author: Shivaram Venkataraman <sh...@cs.berkeley.edu>
Closes #2510 from shivaram/spark-ec2-version and squashes the following commits:
bb0dd16 [Shivaram Venkataraman] Set EC2 version to 1.1.0 and update version map
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/50f86336
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/50f86336
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/50f86336
Branch: refs/heads/master
Commit: 50f863365348d52a9285fc779efbedbf1567ea11
Parents: c429126
Author: Shivaram Venkataraman <sh...@cs.berkeley.edu>
Authored: Wed Sep 24 11:34:39 2014 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Wed Sep 24 11:34:39 2014 -0700
----------------------------------------------------------------------
ec2/spark_ec2.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/50f86336/ec2/spark_ec2.py
----------------------------------------------------------------------
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py
index fbeccd8..7f2cd7d 100755
--- a/ec2/spark_ec2.py
+++ b/ec2/spark_ec2.py
@@ -38,7 +38,7 @@ import boto
from boto.ec2.blockdevicemapping import BlockDeviceMapping, BlockDeviceType, EBSBlockDeviceType
from boto import ec2
-DEFAULT_SPARK_VERSION = "1.0.0"
+DEFAULT_SPARK_VERSION = "1.1.0"
# A URL prefix from which to fetch AMI information
AMI_PREFIX = "https://raw.github.com/mesos/spark-ec2/v2/ami-list"
@@ -218,7 +218,7 @@ def is_active(instance):
def get_spark_shark_version(opts):
spark_shark_map = {
"0.7.3": "0.7.1", "0.8.0": "0.8.0", "0.8.1": "0.8.1", "0.9.0": "0.9.0", "0.9.1": "0.9.1",
- "1.0.0": "1.0.0"
+ "1.0.0": "1.0.0", "1.0.1": "1.0.1", "1.0.2": "1.0.2", "1.1.0": "1.1.0"
}
version = opts.spark_version.replace("v", "")
if version not in spark_shark_map:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org