[
https://issues.apache.org/jira/browse/PIG-4820?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15179303#comment-15179303
]
Pallavi Rao commented on PIG-4820:
----------------------------------
[~xuefuz], I have uploaded a new patch with only those files that had merge
conflicts.
> Merge trunk[3] into spark branch
> --------------------------------
>
> Key: PIG-4820
> URL: https://issues.apache.org/jira/browse/PIG-4820
> Project: Pig
> Issue Type: Sub-task
> Components: spark
> Reporter: Pallavi Rao
> Assignee: Pallavi Rao
> Labels: spork
> Fix For: spark-branch
>
> Attachments: PIG-4820-conflicts.patch, PIG-4820.patch
>
>
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
