[ https://issues.apache.org/jira/browse/HIVE-9257?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14274161#comment-14274161 ]
Szehon Ho commented on HIVE-9257: --------------------------------- Yea sorry thats the way it went about the weekend. We made the JIRA on Monday for people to know the intention. The code cleanup took all week, longer than I anticipated due to state of spark-branch, and first patch was linked early on Friday during the workday. And as Brock said, it is really hard to merge such a big branch during the week when trunk is in constant motion (tons of conflicts), making the weekend the only viable choice to do it. Also its my fault about missing the snapshot as part of the patch, it is fixed already in HIVE 7674 last week and will be merged in next merge (I missed it not being in this merge). I could fix it immediately too, but was going to collect some more fixes and then merge by tomorrow/Wed. > Merge from spark to trunk January 2015 > -------------------------------------- > > Key: HIVE-9257 > URL: https://issues.apache.org/jira/browse/HIVE-9257 > Project: Hive > Issue Type: Sub-task > Components: Spark > Affects Versions: 0.15.0 > Reporter: Szehon Ho > Assignee: Szehon Ho > Labels: TODOC15 > Fix For: 0.15.0 > > Attachments: trunk-mr2-spark-merge.properties > > > The hive on spark work has reached a point where we can merge it into the > trunk branch. Note that spark execution engine is optional and no current > users should be impacted. > This JIRA will be used to track the merge. -- This message was sent by Atlassian JIRA (v6.3.4#6332)