[ https://issues.apache.org/jira/browse/HDFS-13930?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Erik Krogen resolved HDFS-13930. -------------------------------- Resolution: Fixed > Fix crlf line endings in HDFS-12943 branch > ------------------------------------------ > > Key: HDFS-13930 > URL: https://issues.apache.org/jira/browse/HDFS-13930 > Project: Hadoop HDFS > Issue Type: Sub-task > Reporter: Erik Krogen > Assignee: Erik Krogen > Priority: Major > Attachments: HDFS-13930-HDFS-12943.000.patch, > branch-HDFS-12943-before.pdf > > > One of the merge commits introduced the wrong line endings to some {{*.cmd}} > files. Looks like it was commit {{1363eff69c3}} that broke it. > The tree is: > {code} > * | 1363eff69c3 2018-09-17 Merge commit > '9af96d4ed4b6f80d3ca53a2b003d2ef768650dd4' into HDFS-12943 [Konstantin V > Shvachko <s...@apache.org>] > |\ \ > | |/ > | * 9af96d4ed4b 2018-09-05 HADOOP-15707. Add IsActiveServlet to be used for > Load Balancers. Contributed by Lukas Majercak. [Giovanni Matteo Fumarola > <gif...@apache.org>] > * | 94d7f90e93b 2018-09-17 Merge commit > 'e780556ae9229fe7a90817eb4e5449d7eed35dd8' into HDFS-12943 [Konstantin V > Shvachko <s...@apache.org>] > {code} > So that merge commit should have only introduced a single new commit > {{9af96d4ed4b}}. But: > {code} > ± git show --stat 9af96d4ed4b | cat > commit 9af96d4ed4b6f80d3ca53a2b003d2ef768650dd4 > Author: Giovanni Matteo Fumarola <gif...@apache.org> > Date: Wed Sep 5 10:50:25 2018 -0700 > HADOOP-15707. Add IsActiveServlet to be used for Load Balancers. > Contributed by Lukas Majercak. > .../org/apache/hadoop/http/IsActiveServlet.java | 71 ++++++++++++++++ > .../apache/hadoop/http/TestIsActiveServlet.java | 95 > ++++++++++++++++++++++ > .../federation/router/IsRouterActiveServlet.java | 37 +++++++++ > .../server/federation/router/RouterHttpServer.java | 9 ++ > .../src/site/markdown/HDFSRouterFederation.md | 2 +- > .../server/namenode/IsNameNodeActiveServlet.java | 33 ++++++++ > .../hdfs/server/namenode/NameNodeHttpServer.java | 3 + > .../site/markdown/HDFSHighAvailabilityWithQJM.md | 8 ++ > .../IsResourceManagerActiveServlet.java | 38 +++++++++ > .../server/resourcemanager/ResourceManager.java | 5 ++ > .../resourcemanager/webapp/RMWebAppFilter.java | 3 +- > .../src/site/markdown/ResourceManagerHA.md | 5 ++ > 12 files changed, 307 insertions(+), 2 deletions(-) > {code} > that commit has no changes to the cmd, whereas the merge commit does: > {code} > ± git show --stat 1363eff69c3 | cat > commit 1363eff69c36c4f2085194b59a86370505cc00cd > Merge: 94d7f90e93b 9af96d4ed4b > Author: Konstantin V Shvachko <s...@apache.org> > Date: Mon Sep 17 17:39:11 2018 -0700 > Merge commit '9af96d4ed4b6f80d3ca53a2b003d2ef768650dd4' into HDFS-12943 > # Conflicts: > # > hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSHighAvailabilityWithQJM.md > .../hadoop-common/src/main/bin/start-all.cmd | 104 > ++++++++++----------- > .../hadoop-common/src/main/bin/stop-all.cmd | 104 > ++++++++++----------- > .../org/apache/hadoop/http/IsActiveServlet.java | 71 ++++++++++++++ > .../apache/hadoop/http/TestIsActiveServlet.java | 95 +++++++++++++++++++ > .../federation/router/IsRouterActiveServlet.java | 37 ++++++++ > .../server/federation/router/RouterHttpServer.java | 9 ++ > .../src/site/markdown/HDFSRouterFederation.md | 2 +- > .../hadoop-hdfs/src/main/bin/hdfs-config.cmd | 86 ++++++++--------- > .../hadoop-hdfs/src/main/bin/start-dfs.cmd | 82 ++++++++-------- > .../hadoop-hdfs/src/main/bin/stop-dfs.cmd | 82 ++++++++-------- > .../server/namenode/IsNameNodeActiveServlet.java | 33 +++++++ > .../hdfs/server/namenode/NameNodeHttpServer.java | 3 + > .../site/markdown/HDFSHighAvailabilityWithQJM.md | 8 ++ > hadoop-mapreduce-project/bin/mapred-config.cmd | 86 ++++++++--------- > hadoop-tools/hadoop-streaming/src/test/bin/cat.cmd | 36 +++---- > .../hadoop-streaming/src/test/bin/xargs_cat.cmd | 36 +++---- > hadoop-yarn-project/hadoop-yarn/bin/start-yarn.cmd | 94 +++++++++---------- > hadoop-yarn-project/hadoop-yarn/bin/stop-yarn.cmd | 94 +++++++++---------- > .../IsResourceManagerActiveServlet.java | 38 ++++++++ > .../server/resourcemanager/ResourceManager.java | 5 + > .../resourcemanager/webapp/RMWebAppFilter.java | 3 +- > .../src/site/markdown/ResourceManagerHA.md | 5 + > 22 files changed, 709 insertions(+), 404 deletions(-) > {code} -- This message was sent by Atlassian JIRA (v7.6.3#76005) --------------------------------------------------------------------- To unsubscribe, e-mail: hdfs-dev-unsubscr...@hadoop.apache.org For additional commands, e-mail: hdfs-dev-h...@hadoop.apache.org