Skip to content

Update CHANGES.txt and spark-ec2 and R package versions for 1.6.1 #11407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
JoshRosen wants to merge 2 commits into from
Closed

Update CHANGES.txt and spark-ec2 and R package versions for 1.6.1 #11407

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e5c8e1
Update spark-ec2 and R package versions for 1.6.1
JoshRosen Feb 27, 2016
c431912
Update CHANGES.txt.
JoshRosen Feb 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Update spark-ec2 and R package versions for 1.6.1
  • Loading branch information
@JoshRosen
JoshRosen committed Feb 27, 2016
commit 9e5c8e14c34ef9cc79c07b4a783d780776862c4b
2 changes: 1 addition & 1 deletion R/pkg/DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: SparkR
Type: Package
Title: R frontend for Spark
Version: 1.6.0
Version: 1.6.1
Date: 2013-09-09
Author: The Apache Software Foundation
Maintainer: Shivaram Venkataraman <[email protected]>
Expand Down
4 changes: 2 additions & 2 deletions dev/create-release/generate-changelist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
import traceback

SPARK_HOME = os.environ["SPARK_HOME"]
NEW_RELEASE_VERSION = "1.6.0"
PREV_RELEASE_GIT_TAG = "v1.5.2"
NEW_RELEASE_VERSION = "1.6.1"
PREV_RELEASE_GIT_TAG = "v1.6.0"

CHANGELIST = "CHANGES.txt"
OLD_CHANGELIST = "%s.old" % (CHANGELIST)
Expand Down
4 changes: 3 additions & 1 deletion ec2/spark_ec2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
raw_input = input
xrange = range

SPARK_EC2_VERSION = "1.6.0"
SPARK_EC2_VERSION = "1.6.1"
SPARK_EC2_DIR = os.path.dirname(os.path.realpath(__file__))

VALID_SPARK_VERSIONS = set([
Expand All @@ -76,6 +76,7 @@
"1.5.1",
"1.5.2",
"1.6.0",
"1.6.1",
])

SPARK_TACHYON_MAP = {
Expand All @@ -94,6 +95,7 @@
"1.5.1": "0.7.1",
"1.5.2": "0.7.1",
"1.6.0": "0.8.2",
"1.6.1": "0.8.2",
}

DEFAULT_SPARK_VERSION = SPARK_EC2_VERSION
Expand Down