You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ss...@apache.org on 2012/08/22 00:34:42 UTC
svn commit: r1375833 - in
/hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project: ./
hadoop-auth/ hadoop-common/ hadoop-common/CHANGES.txt
hadoop-common/src/main/docs/ hadoop-common/src/main/java/
hadoop-common/src/test/core/
Author: sseth
Date: Tue Aug 21 22:34:40 2012
New Revision: 1375833
URL: http://svn.apache.org/viewvc?rev=1375833&view=rev
Log:
merge YARN-22 from trunk. Fix ContainerLogs to work if the log-dir is specified as a URI. (Contributed by Mayank Bansal)
Modified:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/ (props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-auth/ (props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/ (props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt (props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/main/docs/ (props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/main/java/ (props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/core/ (props changed)
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project:r1375829
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-auth/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-auth:r1375829
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1375829
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1375829
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1375829
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1375829
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1375829