Author: clamb
Date: Tue Aug 12 17:02:07 2014
New Revision: 1617532
URL: http://svn.apache.org/r1617532
Log:
merge from trunk r1617527
Modified:
hadoop/common/branches/fs-encryption/ (props changed)
hadoop/common/branches/fs-encryption/BUILDING.txt
hadoop/common/branches/fs-encryption/hadoop-project/pom.xml
Propchange: hadoop/common/branches/fs-encryption/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1616587-1617527
Modified: hadoop/common/branches/fs-encryption/BUILDING.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/fs-encryption/BUILDING.txt?rev=1617532&r1=1617531&r2=1617532&view=diff
==============================================================================
--- hadoop/common/branches/fs-encryption/BUILDING.txt (original)
+++ hadoop/common/branches/fs-encryption/BUILDING.txt Tue Aug 12 17:02:07 2014
@@ -210,6 +210,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/fs-encryption/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/fs-encryption/hadoop-project/pom.xml?rev=1617532&r1=1617531&r2=1617532&view=diff
==============================================================================
--- hadoop/common/branches/fs-encryption/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/fs-encryption/hadoop-project/pom.xml Tue Aug 12
17:02:07 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>
