Author: todd
Date: Mon Apr 2 07:28:42 2012
New Revision: 1308260
URL: http://svn.apache.org/viewvc?rev=1308260&view=rev
Log:
Merge trunk into auto-failover branch
Modified:
hadoop/common/branches/HDFS-3042/ (props changed)
hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml
Propchange: hadoop/common/branches/HDFS-3042/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1306587-1308235
Modified: hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml?rev=1308260&r1=1308259&r2=1308260&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml Mon Apr 2 07:28:42
2012
@@ -283,7 +283,7 @@
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
- <version>1.4.1</version>
+ <version>3.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
