You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@pig.apache.org by "Xuefu Zhang (JIRA)" <ji...@apache.org> on 2016/04/02 23:57:25 UTC
[jira] [Resolved] (PIG-4855) Merge trunk[4] into spark branch
[ https://issues.apache.org/jira/browse/PIG-4855?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Xuefu Zhang resolved PIG-4855.
------------------------------
Resolution: Fixed
Merged from trunk to Spark branch.
> Merge trunk[4] into spark branch
> ---------------------------------
>
> Key: PIG-4855
> URL: https://issues.apache.org/jira/browse/PIG-4855
> Project: Pig
> Issue Type: Sub-task
> Components: spark
> Reporter: Pallavi Rao
> Assignee: Pallavi Rao
> Labels: spork
> Fix For: spark-branch
>
> Attachments: PIG-4855-conflicts.patch, PIG-4855_2.patch, PIG-4855_3.patch
>
>
> Hopefully, a final merge from trunk to spark branch. There was a merge conflict. Will upload the patch that resolves the conflict once I ensure all UTs pass.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)