Author: brandonli
Date: Thu Aug 7 22:50:41 2014
New Revision: 1616618
URL: http://svn.apache.org/r1616618
Log:
HADOOP-10929. Merging change r1616616 from trunk
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1616618&r1=1616617&r2=1616618&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Thu Aug 7 22:50:41 2014
@@ -113,6 +113,9 @@ Release 2.6.0 - UNRELEASED
HADOOP-10931 compile error on tools/hadoop-openstack (xukun via stevel)
+ HADOOP-10929. Typo in Configuration.getPasswordFromCredentialProviders
+ (lmccay via brandonli)
+
Release 2.5.0 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java?rev=1616618&r1=1616617&r2=1616618&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
Thu Aug 7 22:50:41 2014
@@ -1775,7 +1775,7 @@ public class Configuration implements It
public char[] getPassword(String name) throws IOException {
char[] pass = null;
- pass = getPasswordFromCredenitalProviders(name);
+ pass = getPasswordFromCredentialProviders(name);
if (pass == null) {
pass = getPasswordFromConfig(name);
@@ -1791,7 +1791,7 @@ public class Configuration implements It
* @return password or null if not found
* @throws IOException
*/
- protected char[] getPasswordFromCredenitalProviders(String name)
+ protected char[] getPasswordFromCredentialProviders(String name)
throws IOException {
char[] pass = null;
try {
