hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ji...@apache.org
Subject svn commit: r1561802 - in /hadoop/common/branches/HDFS-5698: ./ hadoop-assemblies/src/main/resources/assemblies/ hadoop-project/ hadoop-project/src/site/ hadoop-tools/hadoop-distcp/ hadoop-tools/hadoop-openstack/
Date Mon, 27 Jan 2014 19:31:52 GMT
Author: jing9
Date: Mon Jan 27 19:31:47 2014
New Revision: 1561802

URL: http://svn.apache.org/r1561802
Log:
Merging r1560794 through r1561801 from trunk.

Modified:
    hadoop/common/branches/HDFS-5698/   (props changed)
    hadoop/common/branches/HDFS-5698/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
    hadoop/common/branches/HDFS-5698/hadoop-project/pom.xml
    hadoop/common/branches/HDFS-5698/hadoop-project/src/site/site.xml
    hadoop/common/branches/HDFS-5698/hadoop-tools/hadoop-distcp/pom.xml
    hadoop/common/branches/HDFS-5698/hadoop-tools/hadoop-openstack/pom.xml
    hadoop/common/branches/HDFS-5698/pom.xml

Propchange: hadoop/common/branches/HDFS-5698/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk:r1560794-1561801
  Merged /hadoop/common/branches/YARN-321:r1556680-1561449

Modified: hadoop/common/branches/HDFS-5698/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml?rev=1561802&r1=1561801&r2=1561802&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5698/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
(original)
+++ hadoop/common/branches/HDFS-5698/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
Mon Jan 27 19:31:47 2014
@@ -123,6 +123,13 @@
       </includes>
     </fileSet>
     <fileSet>
+      <directory>hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/target</directory>
+      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+      <includes>
+        <include>*-sources.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
       <directory>hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/target</directory>
       <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
       <includes>

Modified: hadoop/common/branches/HDFS-5698/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-project/pom.xml?rev=1561802&r1=1561801&r2=1561802&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5698/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-5698/hadoop-project/pom.xml Mon Jan 27 19:31:47 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/HDFS-5698/hadoop-project/src/site/site.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-project/src/site/site.xml?rev=1561802&r1=1561801&r2=1561802&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5698/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/branches/HDFS-5698/hadoop-project/src/site/site.xml Mon Jan 27 19:31:47
2014
@@ -59,6 +59,7 @@
       <item name="CLI Mini Cluster" href="hadoop-project-dist/hadoop-common/CLIMiniCluster.html"/>
       <item name="Native Libraries" href="hadoop-project-dist/hadoop-common/NativeLibraries.html"/>
       <item name="Superusers" href="hadoop-project-dist/hadoop-common/Superusers.html"/>
+      <item name="Secure Mode" href="hadoop-project-dist/hadoop-common/SecureMode.html"/>
       <item name="Service Level Authorization" href="hadoop-project-dist/hadoop-common/ServiceLevelAuth.html"/>
       <item name="HTTP Authentication" href="hadoop-project-dist/hadoop-common/HttpAuthentication.html"/>
     </menu>

Modified: hadoop/common/branches/HDFS-5698/hadoop-tools/hadoop-distcp/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-tools/hadoop-distcp/pom.xml?rev=1561802&r1=1561801&r2=1561802&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5698/hadoop-tools/hadoop-distcp/pom.xml (original)
+++ hadoop/common/branches/HDFS-5698/hadoop-tools/hadoop-distcp/pom.xml Mon Jan 27 19:31:47
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/HDFS-5698/hadoop-tools/hadoop-openstack/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-tools/hadoop-openstack/pom.xml?rev=1561802&r1=1561801&r2=1561802&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5698/hadoop-tools/hadoop-openstack/pom.xml (original)
+++ hadoop/common/branches/HDFS-5698/hadoop-tools/hadoop-openstack/pom.xml Mon Jan 27 19:31:47
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/HDFS-5698/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/pom.xml?rev=1561802&r1=1561801&r2=1561802&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5698/pom.xml (original)
+++ hadoop/common/branches/HDFS-5698/pom.xml Mon Jan 27 19:31:47 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>



Mime
View raw message