[ https://issues.apache.org/jira/browse/PIG-5132?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15880383#comment-15880383 ]
Nandor Kollar commented on PIG-5132: ------------------------------------ +1 for PIG-5132.1.patch and PIG-5132.1.patch and PIG-5132.1_fixes.patch. Like Adam told, there are still differences, these can cause problems we should fix one-by-one later, we should avoid fixing these manually. > Merge from trunk (5) [Spark Branch] > ----------------------------------- > > Key: PIG-5132 > URL: https://issues.apache.org/jira/browse/PIG-5132 > Project: Pig > Issue Type: Bug > Components: spark > Reporter: liyunzhang_intel > Assignee: liyunzhang_intel > Fix For: spark-branch > > Attachments: diffOfPatches.png, jenkins.5132.2.fix.PNG, > PIG-5132.1_fixes.patch, PIG-5132.1.patch, PIG-5132.2.fix.patch, > PIG-5132.2.zip, 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)