[jira] [Updated] (PIG-4820) Merge trunk[3] into spark branch

[ https://issues.apache.org/jira/browse/PIG-4820?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Xuefu Zhang updated PIG-4820: - Resolution: Fixed Status: Resolved (was: Patch Available) Patch committed to spark branch.

[jira] [Updated] (PIG-4820) Merge trunk[3] into spark branch

[ https://issues.apache.org/jira/browse/PIG-4820?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Pallavi Rao updated PIG-4820: - Attachment: PIG-4820-conflicts.patch > Merge trunk[3] into spark branch >

[jira] [Updated] (PIG-4820) Merge trunk[3] into spark branch

[ https://issues.apache.org/jira/browse/PIG-4820?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Pallavi Rao updated PIG-4820: - Attachment: (was: PIG-4820-conflicts.patch) > Merge trunk[3] into spark branch >

[jira] [Updated] (PIG-4820) Merge trunk[3] into spark branch

[ https://issues.apache.org/jira/browse/PIG-4820?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Pallavi Rao updated PIG-4820: - Attachment: PIG-4820-conflicts.patch Patch with changes to resolve the merge conflicts. > Merge trunk[3]

[jira] [Updated] (PIG-4820) Merge trunk[3] into spark branch

[ https://issues.apache.org/jira/browse/PIG-4820?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Pallavi Rao updated PIG-4820: - Attachment: PIG-4820.patch The following files had conflict that I resolved manually: build.xml ivy.xml