[
https://issues.apache.org/jira/browse/HDFS-12509?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16179188#comment-16179188
]
Anu Engineer commented on HDFS-12509:
-------------------------------------
It might be due to the fact that we don't have latest sources from the trunk.
Please do this.
1. git checkout trunk
2. git pull
3. git checkout HDFS-7240
4. git merge trunk
5. complete the merge.
6. Run your diff command again.
> Ozone: Revert files not related to ozone change in HDFS-7240 branch
> -------------------------------------------------------------------
>
> Key: HDFS-12509
> URL: https://issues.apache.org/jira/browse/HDFS-12509
> Project: Hadoop HDFS
> Issue Type: Sub-task
> Components: ozone
> Affects Versions: HDFS-7240
> Reporter: Mukul Kumar Singh
> Assignee: Mukul Kumar Singh
> Labels: ozoneMerge
> Fix For: HDFS-7240
>
> Attachments: HDFS-12509-HDFS-7240.001.patch
>
>
> Creating a diff patch of the current HDFS-7240 branch finds some files which
> are not related to ozone in the diff, these files should be reverted before
> the merge.
> {code}
> HW13605:hadoop-mapreduce-examples msingh$ grep "diff --git" ~/oz_branch_diff
> | grep yarn
> diff --git
> a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flow/info-test.js
>
> b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/package-info.java
> diff --git
> a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/charts-test.js
>
> b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/protocol/package-info.java
> diff --git
> a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/attempts-test.js
>
> b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/cli/ResultCode.java
> diff --git
> a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java
>
> b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java
> diff --git
> a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/RLESparseResourceAllocation.java
>
> b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/RLESparseResourceAllocation.java
> diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
> b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
> {code}
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
---------------------------------------------------------------------
To unsubscribe, e-mail: hdfs-issues-unsubscr...@hadoop.apache.org
For additional commands, e-mail: hdfs-issues-h...@hadoop.apache.org
