[
https://issues.apache.org/jira/browse/PIG-5132?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15882173#comment-15882173
]
liyunzhang_intel commented on PIG-5132:
---------------------------------------
[~szita]: can not use git apply PIG-5132.1.patch, error is like following
{code}
[root@bdpe42 pig.on.spark]# git apply --whitespace=warn PIG-5132.1.patch
PIG-5132.1.patch:31: trailing whitespace.
To compile with Hadoop 2.x
PIG-5132.1.patch:37: trailing whitespace.
PIG-5132.1.patch:55: trailing whitespace.
A very valid way of working is by having your favourite IDE that has the
project
PIG-5132.1.patch:65: trailing whitespace.
PIG-5132.1.patch:76: trailing whitespace.
tree from where you started.
error: patch failed:
src/org/apache/pig/backend/hadoop/datastorage/HDataStorage.java:18
error: src/org/apache/pig/backend/hadoop/datastorage/HDataStorage.java: patch
does not apply
error: patch failed: test/e2e/pig/tests/multiquery.conf:728
error: test/e2e/pig/tests/multiquery.conf: patch does not apply
{code}
> 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)
