Author: ddas
Date: Wed Jun 6 20:30:01 2012
New Revision: 1347102
URL: http://svn.apache.org/viewvc?rev=1347102&view=rev
Log:
Merge -r 1347100:1347101 from branch-1.1 onto branch-1. Fixes HADOOP-6947.
Added:
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/ManualTestKeytabLogins.java
- copied unchanged from r1347101,
hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/security/ManualTestKeytabLogins.java
Modified:
hadoop/common/branches/branch-1/ (props changed)
hadoop/common/branches/branch-1/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/security/UserGroupInformation.java
hadoop/common/branches/branch-1/src/mapred/ (props changed)
Propchange: hadoop/common/branches/branch-1/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1.1:r1347101
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1347102&r1=1347101&r2=1347102&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Wed Jun 6 20:30:01 2012
@@ -262,6 +262,9 @@ Release 1.1.0 - unreleased
HADOOP-5464. DFSClient did not treat write timeout of 0 properly.
(Raghu Angadi and Brandon Li via szetszwo)
+
+ HADOOP-6947. Kerberos relogin should set refreshKrb5Config to true.
+ (Todd Lipcon via ddas)
Release 1.0.3 - 2012.05.07
Propchange: hadoop/common/branches/branch-1/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1.1/CHANGES.txt:r1347101
Modified:
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/security/UserGroupInformation.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/core/org/apache/hadoop/security/UserGroupInformation.java?rev=1347102&r1=1347101&r2=1347102&view=diff
==============================================================================
---
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/security/UserGroupInformation.java
(original)
+++
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/security/UserGroupInformation.java
Wed Jun 6 20:30:01 2012
@@ -376,6 +376,7 @@ public class UserGroupInformation {
KEYTAB_KERBEROS_OPTIONS.put("doNotPrompt", "true");
KEYTAB_KERBEROS_OPTIONS.put("useKeyTab", "true");
KEYTAB_KERBEROS_OPTIONS.put("storeKey", "true");
+ KEYTAB_KERBEROS_OPTIONS.put("refreshKrb5Config", "true");
}
private static final AppConfigurationEntry KEYTAB_KERBEROS_LOGIN =
new AppConfigurationEntry(KerberosUtil.getKrb5LoginModuleName(),
Propchange: hadoop/common/branches/branch-1/src/mapred/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1.1/src/mapred:r1347101
