[JIRA] (SPARKR-225) Merging sparkr-sql branch into master

20 views
Skip to first unread message

Davies (JIRA)

unread,
Mar 12, 2015, 5:03:01 PM3/12/15
to spark...@googlegroups.com
Davies created an issue
 
SparkR / Sub-task SPARKR-225
Merging sparkr-sql branch into master
Issue Type: Sub-task Sub-task
Assignee: Davies
Created: 12/Mar/15 2:02 PM
Priority: Major Major
Reporter: Davies

Before merging sparkr-sql into master, we should merging master into sparkr-sql branch.

In order to minimize the conflict, could we hold some changes in master?

Add Comment Add Comment
 
This message was sent by Atlassian JIRA (v6.4-OD-15-055#64014-sha1:797c660)
Atlassian logo

Davies (JIRA)

unread,
Mar 12, 2015, 5:12:01 PM3/12/15
to spark...@googlegroups.com
Davies commented on Sub-task SPARKR-225
 
Re: Merging sparkr-sql branch into master

There are some conflict in master and sparkr-sql branch, we should merge them ASAP.

Shivaram Venkataraman (JIRA)

unread,
Mar 12, 2015, 5:20:01 PM3/12/15
to spark...@googlegroups.com

Davies we don't want to merge Sparkr-SQL into master long term as SparkRSQL needs Spark 1.3. So the plan is that we will keep master compatible with Spark 1.2 and we will rename sparkr-sql as branch-1.3

However, we still need to merge a bunch of stuff from master to sparkr-sql and also some non-DF changes from sparkr-sql to master. Will try to do this ASAP

Shivaram Venkataraman (JIRA)

unread,
Mar 12, 2015, 5:26:02 PM3/12/15
to spark...@googlegroups.com

Also in terms of the upcoming merge in Apache Spark we will base that out of the sparkr-sql branch (i.e. branch-1.3)

Davies (JIRA)

unread,
Mar 12, 2015, 5:31:03 PM3/12/15
to spark...@googlegroups.com
Davies commented on Sub-task SPARKR-225

Then it means that we will need to use sparkr-sql branch as the default branch to develop (for anything)?

Shivaram Venkataraman (JIRA)

unread,
Mar 12, 2015, 6:44:02 PM3/12/15
to spark...@googlegroups.com

Its not a bad idea, but that might not really be required given the short timeline we are looking at. My plan is that after working through the PRs that are currently open (these cover most of the critical issues), I will create a Spark fork at amplab-extras/spark. We will then move development over there and format things for the merge. I also just sent an email with this plan.

Shivaram Venkataraman (JIRA)

unread,
Mar 13, 2015, 3:15:02 AM3/13/15
to spark...@googlegroups.com
 
Re: Merging master branch into sparkr-sql

Davies I changed the title of the issue to reflect that we will track the master -> sparkr-sql merge here

Sun Rui I'll open another issue for the other side merge

Shivaram Venkataraman (JIRA)

unread,
Mar 13, 2015, 3:15:02 AM3/13/15
to spark...@googlegroups.com
Shivaram Venkataraman updated an issue
 
Change By: Shivaram Venkataraman
Summary: Merging  master branch into  sparkr-sql  branch into master

Shivaram Venkataraman (JIRA)

unread,
Mar 16, 2015, 12:09:01 AM3/16/15
to spark...@googlegroups.com
Reply all
Reply to author
Forward
0 new messages