Author: vinayakumarb
Date: Fri Jun 20 05:03:56 2014
New Revision: 1604086
URL: http://svn.apache.org/r1604086
Log:
Merged latest changes from trunk
Modified:
hadoop/common/branches/HDFS-5442/ (props changed)
hadoop/common/branches/HDFS-5442/hadoop-project/pom.xml
Propchange: hadoop/common/branches/HDFS-5442/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1603355-1604085
Modified: hadoop/common/branches/HDFS-5442/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5442/hadoop-project/pom.xml?rev=1604086&r1=1604085&r2=1604086&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5442/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-5442/hadoop-project/pom.xml Fri Jun 20 05:03:56
2014
@@ -775,6 +775,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-kerberos-codec</artifactId>
+ <version>2.0.0-M15</version>
+ </dependency>
+
+ <dependency>
<groupId>com.microsoft.windowsazure.storage</groupId>
<artifactId>microsoft-windowsazure-storage-sdk</artifactId>
<version>0.6.0</version>
