Author: jing9
Date: Fri Aug 8 22:21:35 2014
New Revision: 1616897
URL: http://svn.apache.org/r1616897
Log:
Merging r1616428 through r1616893 from trunk.
Modified:
hadoop/common/branches/HDFS-6584/ (props changed)
hadoop/common/branches/HDFS-6584/BUILDING.txt
hadoop/common/branches/HDFS-6584/hadoop-project/pom.xml
hadoop/common/branches/HDFS-6584/hadoop-project/src/site/site.xml
hadoop/common/branches/HDFS-6584/hadoop-tools/hadoop-openstack/pom.xml
Propchange: hadoop/common/branches/HDFS-6584/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2:r1616481
Merged /hadoop/common/trunk:r1616428-1616893
Modified: hadoop/common/branches/HDFS-6584/BUILDING.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6584/BUILDING.txt?rev=1616897&r1=1616896&r2=1616897&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-6584/BUILDING.txt (original)
+++ hadoop/common/branches/HDFS-6584/BUILDING.txt Fri Aug 8 22:21:35 2014
@@ -189,6 +189,7 @@ Requirements:
* Maven 3.0 or later
* Findbugs 1.3.9 (if running findbugs)
* ProtocolBuffer 2.5.0
+* CMake 2.6 or newer
* Windows SDK or Visual Studio 2010 Professional
* Unix command-line tools from GnuWin32 or Cygwin: sh, mkdir, rm, cp, tar, gzip
* zlib headers (if building native code bindings for zlib)
Modified: hadoop/common/branches/HDFS-6584/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6584/hadoop-project/pom.xml?rev=1616897&r1=1616896&r2=1616897&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-6584/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-6584/hadoop-project/pom.xml Fri Aug 8 22:21:35
2014
@@ -104,6 +104,12 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-nfs</artifactId>
<version>${project.version}</version>
</dependency>
Modified: hadoop/common/branches/HDFS-6584/hadoop-project/src/site/site.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6584/hadoop-project/src/site/site.xml?rev=1616897&r1=1616896&r2=1616897&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-6584/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/branches/HDFS-6584/hadoop-project/src/site/site.xml Fri Aug
8 22:21:35 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/HDFS-6584/hadoop-tools/hadoop-openstack/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6584/hadoop-tools/hadoop-openstack/pom.xml?rev=1616897&r1=1616896&r2=1616897&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-6584/hadoop-tools/hadoop-openstack/pom.xml
(original)
+++ hadoop/common/branches/HDFS-6584/hadoop-tools/hadoop-openstack/pom.xml Fri
Aug 8 22:21:35 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>
