From bc00b8ce9e28dc40b5a4c378b5c2ca86b35a318a Mon Sep 17 00:00:00 2001
From: Colin Patrick Mccabe <cmccabe@cloudera.com>
Date: Wed, 27 Jan 2016 11:39:55 -0800
Subject: [PATCH] HADOOP-12735. core-default.xml misspells
 hadoop.workaround.non.threadsafe.getpwuid (Ray Chiang via cmccabe)

(cherry picked from commit 2e8ab3d46568162af6aa90b612ed61d487e7c7b0)
(cherry picked from commit b94fbdf6f080a95ad8f2d787bc8e219e8eeea0f6)
---
 hadoop-common-project/hadoop-common/CHANGES.txt                | 3 +++
 .../hadoop-common/src/main/resources/core-default.xml          | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 040f1433fd5..f3b026feebc 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -964,6 +964,9 @@ Release 2.8.0 - UNRELEASED
     HADOOP-12718. Incorrect error message by fs -put local dir without
     permission. (John Zhuge via Yongjun Zhang)
 
+    HADOOP-12735. core-default.xml misspells
+    hadoop.workaround.non.threadsafe.getpwuid (Ray Chiang via cmccabe)
+
 Release 2.7.3 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
index c3cc693cb83..f6a8f9d68cc 100644
--- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
+++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
@@ -437,7 +437,7 @@ for ldap providers in the same way as above does.
 </property>
 
 <property>
-  <name>hadoop.work.around.non.threadsafe.getpwuid</name>
+  <name>hadoop.workaround.non.threadsafe.getpwuid</name>
   <value>false</value>
   <description>Some operating systems or authentication modules are known to
   have broken implementations of getpwuid_r and getpwgid_r, such that these