[jira] [Commented] (PIG-5132) Merge from trunk (5) [Spark Branch]

["Adam Szita (JIRA)" <ji...@apache.org>]

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

Adam Szita commented on PIG-5132:
---------------------------------

[~kellyzly]: [~nkollar] and I have created the merge patch too, see [^PIG-5132.1.patch].
It is less in size because file movements are handled as moves and not as deletion/additions. It also includes binary file changes (e.g. ant-contrib.jar).
Basically diff was generated as
{code}
git diff HEAD~ --full-index --binary
{code}
After resolving the merge conflicts we saw some build problems. These along with some e2e testing fixes can be found in a subsequent patch [^PIG-5132.1_fixes.patch]
We're running unit and e2e tests right now.

> Merge from trunk (5) [Spark Branch]
> -----------------------------------
>
>                 Key: PIG-5132
>                 URL: https://issues.apache.org/jira/browse/PIG-5132
>             Project: Pig
>          Issue Type: Sub-task
>          Components: spark
>            Reporter: liyunzhang_intel
>            Assignee: liyunzhang_intel
>             Fix For: spark-branch
>
>         Attachments: PIG-5132.1_fixes.patch, PIG-5132.1.patch, PIG-5132.patch
>
>
> merge changes from trunk to branch.
> the latest commit in trunk is
>  92df45d - (origin/trunk, origin/HEAD, trunk) PIG-5085: Support FLATTEN of maps (szita via rohini) 



--
This message was sent by Atlassian JIRA
(v6.3.15#6346)