[
https://issues.apache.org/jira/browse/PIG-5132?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15882183#comment-15882183
]
liyunzhang_intel commented on PIG-5132:
---------------------------------------
[~szita]: PIG-5132.1.patch is generated by "git diff”？
the changes of NonFSLoadFunc.java is
{code}
diff --git a/shims/test/hadoop20/org/apache/pig/test/TezMiniCluster.java
b/src/org/apache/pig/NonFSLoadFunc.java
similarity index 54%
rename from shims/test/hadoop20/org/apache/pig/test/TezMiniCluster.java
rename to src/org/apache/pig/NonFSLoadFunc.java
index
505c4727caaf849ff20e301222fa67a20655768d..605b693c5ab8b0dd8243b23398e52f38898b8be3
100644
{code}
I'm afraid that this can not be applied if i use "git apply PIG-5132.1.patch"
in pig svn directory.
I redo the patch and commit to svn. If have any problem, please tell me and i
will also verify the report from jenkins.
> 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)
