From 9a2e4f4f9896e4d2a7e03fdb304289885c58096d Mon Sep 17 00:00:00 2001 From: Allen Wittenauer Date: Fri, 19 Sep 2014 11:32:55 -0700 Subject: [PATCH] HADOOP-10946. Fix a bunch of typos in log messages (Ray Chiang via aw) (cherry picked from commit 9f03a7c018bb2c497cd0ef758f1a3e08e8163d06) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt --- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ .../java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 2c520010644..74505138028 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -244,6 +244,8 @@ Release 2.7.0 - UNRELEASED NativeAzureFileSystem#NativeAzureFsInputStream#close(). (Chen He via cnauroth) + HADOOP-10946. Fix a bunch of typos in log messages (Ray Chiang via aw) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java index 577711f4ce0..dae957ee30e 100644 --- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java @@ -1095,7 +1095,7 @@ public class NativeAzureFileSystem extends FileSystem { if (dstKey.startsWith(srcKey + PATH_DELIMITER)) { if (LOG.isDebugEnabled()) { - LOG.debug("Renaming directory to a itself is disallowed. src=" + src + LOG.debug("Renaming directory to itself is disallowed. src=" + src + " dest=" + dst); } return false;