/[Apache-SVN]
ViewVC logotype

Revision 1307414


Jump to revision: Previous Next
Author: tucu
Date: Fri Mar 30 13:41:40 2012 UTC (12 years, 6 months ago)
Changed paths: 4
Log Message:
Merge -r 1307412:1307413 from trunk to branch. FIXES: MAPREDUCE-3916

Changed paths

Path Details
Directoryhadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt modified , text changed
Directoryhadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/proxy/
(Copied from hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/proxy, r1307413)
added
Directoryhadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/proxy/.keep
(Copied from hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/proxy/.keep, r1307413)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26