pig-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "liyunzhang_intel (JIRA)" <j...@apache.org>
Subject [jira] [Commented] (PIG-4855) Merge trunk[4] into spark branch
Date Thu, 31 Mar 2016 14:28:25 GMT

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

liyunzhang_intel commented on PIG-4855:
---------------------------------------

[~pallavi.rao]:  PIG-4855_2.patch does not include all the code  merging from the trunk ?
 If yes, please do a new 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
>
>
> 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)

Mime
View raw message