hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject svn commit: r1616589 - in /hadoop/common/branches/fs-encryption: ./ hadoop-project/src/site/site.xml hadoop-tools/hadoop-openstack/pom.xml
Date Thu, 07 Aug 2014 20:26:54 GMT
Author: wang
Date: Thu Aug  7 20:26:52 2014
New Revision: 1616589

URL: http://svn.apache.org/r1616589
Log:
Merge from trunk to branch.

Modified:
    hadoop/common/branches/fs-encryption/   (props changed)
    hadoop/common/branches/fs-encryption/hadoop-project/src/site/site.xml
    hadoop/common/branches/fs-encryption/hadoop-tools/hadoop-openstack/pom.xml

Propchange: hadoop/common/branches/fs-encryption/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2:r1616481
  Merged /hadoop/common/trunk:r1615851-1616586

Modified: hadoop/common/branches/fs-encryption/hadoop-project/src/site/site.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/fs-encryption/hadoop-project/src/site/site.xml?rev=1616589&r1=1616588&r2=1616589&view=diff
==============================================================================
--- hadoop/common/branches/fs-encryption/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/branches/fs-encryption/hadoop-project/src/site/site.xml Thu Aug  7 20:26:52
2014
@@ -69,6 +69,7 @@
     
     <menu name="HDFS" inherit="top">
       <item name="HDFS User Guide" href="hadoop-project-dist/hadoop-hdfs/HdfsUserGuide.html"/>
+      <item name="HDFS Commands Reference" href="hadoop-project-dist/hadoop-hdfs/HDFSCommands.html"/>
       <item name="High Availability With QJM" href="hadoop-project-dist/hadoop-hdfs/HDFSHighAvailabilityWithQJM.html"/>
       <item name="High Availability With NFS" href="hadoop-project-dist/hadoop-hdfs/HDFSHighAvailabilityWithNFS.html"/>
       <item name="Federation" href="hadoop-project-dist/hadoop-hdfs/Federation.html"/>

Modified: hadoop/common/branches/fs-encryption/hadoop-tools/hadoop-openstack/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/fs-encryption/hadoop-tools/hadoop-openstack/pom.xml?rev=1616589&r1=1616588&r2=1616589&view=diff
==============================================================================
--- hadoop/common/branches/fs-encryption/hadoop-tools/hadoop-openstack/pom.xml (original)
+++ hadoop/common/branches/fs-encryption/hadoop-tools/hadoop-openstack/pom.xml Thu Aug  7
20:26:52 2014
@@ -146,6 +146,11 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
       <scope>test</scope>



Mime
View raw message