[ 
https://issues.apache.org/jira/browse/PIG-4855?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15217376#comment-15217376
 ] 

Pallavi Rao commented on PIG-4855:
----------------------------------

[~xuefuz], can you please commit this? It is blocking the branch merge with 
trunk.

> 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
>
>
> 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)

Reply via email to