You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@pig.apache.org by "liyunzhang_intel (JIRA)" <ji...@apache.org> on 2016/04/01 05:09:25 UTC

[jira] [Updated] (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 ]

liyunzhang_intel updated PIG-4855:
----------------------------------
    Attachment: PIG-4855_3.patch

[~pallavi.rao], [~mohitsabharwal],[~kexianda]:
I have merged the change from trunk to branch and do a new patch PIG-4855_3.patch. Please review. once any of you +1,[~xuefuz],please commit.

How to use?
based on 38c7db2
patch -p1<PIG-4855_3.patch



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