/[Apache-SVN]
ViewVC logotype

Revision 1337200


Jump to revision: Previous Next
Author: tomwhite
Date: Fri May 11 15:04:24 2012 UTC (12 years, 5 months ago)
Changed paths: 18
Log Message:
Merge -r 1337198:1337199 from trunk to branch-2. Fixes: MAPREDUCE-4148.

Changed paths

Path Details
Directoryhadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java modified , text changed
Directoryhadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/TestToken.java modified , text changed
Directoryhadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/resources/META-INF/
(Copied from hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/resources/META-INF, r1337199)
added
Directoryhadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/resources/META-INF/services/
(Copied from hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/resources/META-INF/services, r1337199)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/resources/META-INF/services/org.apache.hadoop.security.token.TokenIdentifier
(Copied from hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/resources/META-INF/services/org.apache.hadoop.security.token.TokenIdentifier, r1337199)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenIdentifier
(Copied from hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenIdentifier, r1337199)
added
Directoryhadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt modified , text changed
Directoryhadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenIdentifier
(Copied from hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenIdentifier, r1337199)
added
Directoryhadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml modified , text changed
Directoryhadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java modified , text changed
Directoryhadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java modified , text changed
Directoryhadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/token/DelegationTokenRenewal.java modified , text changed
Directoryhadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenIdentifier
(Copied from hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenIdentifier, r1337199)
added
Directoryhadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml modified , text changed
Directoryhadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml modified , text changed
Directoryhadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenIdentifier
(Copied from hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenIdentifier, r1337199)
added
Directoryhadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenIdentifier
(Copied from hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenIdentifier, r1337199)
added
Directoryhadoop/common/branches/branch-2/hadoop-mapreduce-project/pom.xml modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26