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/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401508 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
d647f98cb8
commit
e49fb14997
|
@ -62,6 +62,13 @@
|
|||
<include>**/*</include>
|
||||
</includes>
|
||||
</fileSet>
|
||||
<fileSet>
|
||||
<directory>hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/conf</directory>
|
||||
<outputDirectory>etc/hadoop</outputDirectory>
|
||||
<includes>
|
||||
<include>**/*</include>
|
||||
</includes>
|
||||
</fileSet>
|
||||
<fileSet>
|
||||
<directory>${basedir}</directory>
|
||||
<outputDirectory>/share/doc/hadoop/${hadoop.component}</outputDirectory>
|
||||
|
|
|
@ -69,10 +69,14 @@ Release 2.0.3-alpha - Unreleased
|
|||
YARN-150. Fixes AppRejectedTransition does not unregister a rejected
|
||||
app-attempt from the ApplicationMasterService (Bikas Saha via sseth)
|
||||
|
||||
YARN-140. Add capacity-scheduler-default.xml to provide a default set of configurations for the capacity scheduler. (ahmed via tucu)
|
||||
YARN-140. Add capacity-scheduler-default.xml to provide a default set of
|
||||
configurations for the capacity scheduler. (ahmed via tucu)
|
||||
|
||||
YARN-179. Fix some unit test failures. (Vinod Kumar Vavilapalli via sseth)
|
||||
|
||||
YARN-181. Fixed eclipse settings broken by capacity-scheduler.xml move via
|
||||
YARN-140. (Siddharth Seth via vinodkv)
|
||||
|
||||
Release 2.0.2-alpha - 2012-09-07
|
||||
|
||||
YARN-9. Rename YARN_HOME to HADOOP_YARN_HOME. (vinodkv via acmurthy)
|
||||
|
|
|
@ -50,7 +50,7 @@
|
|||
<directory>${basedir}/src/test/resources</directory>
|
||||
</testResource>
|
||||
<testResource>
|
||||
<directory>${basedir}/../../conf</directory>
|
||||
<directory>${basedir}/conf</directory>
|
||||
<includes>
|
||||
<include>capacity-scheduler.xml</include>
|
||||
</includes>
|
||||
|
|
Loading…
Reference in New Issue