/[Apache-SVN]
ViewVC logotype

Revision 1401508

Jump to revision: Previous Next
Author: vinodkv
Date: Tue Oct 23 22:49:37 2012 UTC (12 years, 1 month ago)
Changed paths: 5
Log Message: 
YARN-181. Fixed eclipse settings broken by capacity-scheduler.xml move via YARN-140. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1401504 ../../trunk/

Changed paths

Path Details
Directoryhadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml modified , text changed
Directoryhadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt modified , text changed
Directoryhadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/conf/capacity-scheduler.xml deleted
Directoryhadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/conf/
(Copied from hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/conf, r1401504) 		added
Directoryhadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml modified , text changed
infrastructure at apache.org
 ViewVC Help
Powered by ViewVC 1.1.26