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

["Pallavi Rao (JIRA)" <ji...@apache.org>]

     [ 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
ivy/libraries.properties  src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PORelationToExprProject.java
src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStream.java
test/org/apache/pig/test/TestAssert.java
test/org/apache/pig/test/TestPigServerLocal.java
test/org/apache/pig/test/TestRank1.java
test/org/apache/pig/test/TestRank2.java
test/org/apache/pig/test/TestRank3.java

Auto merge worked on the remaining files.

> Merge trunk[3] into spark branch
> --------------------------------
>
>                 Key: PIG-4820
>                 URL: https://issues.apache.org/jira/browse/PIG-4820
>             Project: Pig
>          Issue Type: Sub-task
>          Components: spark
>            Reporter: Pallavi Rao
>            Assignee: Pallavi Rao
>              Labels: spork
>             Fix For: spark-branch
>
>         Attachments: PIG-4820.patch
>
>




--
This message was sent by Atlassian JIRA
(v6.3.4#6332)