Author: wang
Date: Tue Jul 15 21:10:24 2014
New Revision: 1610853
URL: http://svn.apache.org/r1610853
Log:
Merge from trunk to branch
Modified:
hadoop/common/branches/fs-encryption/ (props changed)
hadoop/common/branches/fs-encryption/hadoop-project/pom.xml
hadoop/common/branches/fs-encryption/hadoop-project/src/site/site.xml
Propchange: hadoop/common/branches/fs-encryption/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2.5:r1609091
Merged /hadoop/common/trunk:r1608601-1610850
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=1610853&r1=1610852&r2=1610853&view=diff
==============================================================================
--- hadoop/common/branches/fs-encryption/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/fs-encryption/hadoop-project/pom.xml Tue Jul 15
21:10:24 2014
@@ -722,7 +722,7 @@
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>bookkeeper-server</artifactId>
- <version>4.0.0</version>
+ <version>4.2.3</version>
<scope>compile</scope>
</dependency>
<dependency>
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=1610853&r1=1610852&r2=1610853&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 Tue
Jul 15 21:10:24 2014
@@ -54,7 +54,7 @@
<item name="FileSystem Shell"
href="hadoop-project-dist/hadoop-common/FileSystemShell.html"/>
<item name="Hadoop Compatibility"
href="hadoop-project-dist/hadoop-common/Compatibility.html"/>
<item name="FileSystem Specification"
- href="hadoop-project-dist/hadoop-common/index.html"/>
+ href="hadoop-project-dist/hadoop-common/filesystem/index.html"/>
</menu>
<menu name="Common" inherit="top">
