Author: vinodkv Date: Fri Jan 24 01:14:59 2014 New Revision: 1560867 URL: http://svn.apache.org/r1560867 Log: YARN-321. Forwarding YARN-321 branch to latest trunk.
Modified: hadoop/common/branches/YARN-321/ (props changed) hadoop/common/branches/YARN-321/hadoop-project/pom.xml hadoop/common/branches/YARN-321/hadoop-tools/hadoop-distcp/pom.xml hadoop/common/branches/YARN-321/hadoop-tools/hadoop-openstack/pom.xml hadoop/common/branches/YARN-321/pom.xml Propchange: hadoop/common/branches/YARN-321/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk:r1560467-1560866 Modified: hadoop/common/branches/YARN-321/hadoop-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-project/pom.xml?rev=1560867&r1=1560866&r2=1560867&view=diff ============================================================================== --- hadoop/common/branches/YARN-321/hadoop-project/pom.xml (original) +++ hadoop/common/branches/YARN-321/hadoop-project/pom.xml Fri Jan 24 01:14:59 2014 @@ -39,10 +39,6 @@ <!-- number of threads/forks to use when running tests in parallel, see parallel-tests profile --> <testsThreadCount>4</testsThreadCount> - <!-- platform encoding override --> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <!-- These 2 versions are defined here becuase they are used --> <!-- JDIFF generation from embedded ant in the antrun plugin --> <jdiff.version>1.0.9</jdiff.version> Modified: hadoop/common/branches/YARN-321/hadoop-tools/hadoop-distcp/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-tools/hadoop-distcp/pom.xml?rev=1560867&r1=1560866&r2=1560867&view=diff ============================================================================== --- hadoop/common/branches/YARN-321/hadoop-tools/hadoop-distcp/pom.xml (original) +++ hadoop/common/branches/YARN-321/hadoop-tools/hadoop-distcp/pom.xml Fri Jan 24 01:14:59 2014 @@ -33,7 +33,6 @@ <properties> <file.encoding>UTF-8</file.encoding> <downloadSources>true</downloadSources> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <dependencies> Modified: hadoop/common/branches/YARN-321/hadoop-tools/hadoop-openstack/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-tools/hadoop-openstack/pom.xml?rev=1560867&r1=1560866&r2=1560867&view=diff ============================================================================== --- hadoop/common/branches/YARN-321/hadoop-tools/hadoop-openstack/pom.xml (original) +++ hadoop/common/branches/YARN-321/hadoop-tools/hadoop-openstack/pom.xml Fri Jan 24 01:14:59 2014 @@ -35,7 +35,6 @@ <properties> <file.encoding>UTF-8</file.encoding> <downloadSources>true</downloadSources> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <profiles> Modified: hadoop/common/branches/YARN-321/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/pom.xml?rev=1560867&r1=1560866&r2=1560867&view=diff ============================================================================== --- hadoop/common/branches/YARN-321/pom.xml (original) +++ hadoop/common/branches/YARN-321/pom.xml Fri Jan 24 01:14:59 2014 @@ -85,6 +85,10 @@ xsi:schemaLocation="http://maven.apache. <distMgmtStagingId>apache.staging.https</distMgmtStagingId> <distMgmtStagingName>Apache Release Distribution Repository</distMgmtStagingName> <distMgmtStagingUrl>https://repository.apache.org/service/local/staging/deploy/maven2</distMgmtStagingUrl> + + <!-- platform encoding override --> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> </properties> <modules>