Author: tomwhite
Date: Wed May 11 04:10:59 2011
New Revision: 1101739
URL: http://svn.apache.org/viewvc?rev=1101739&view=rev
Log:
Merge -r 1101736:1101737 from trunk to branch-0.22. Fixes: HDFS-1544
Modified:
hadoop/hdfs/branches/branch-0.22/CHANGES.txt
hadoop/hdfs/branches/branch-0.22/ivy/ivysettings.xml
Modified: hadoop/hdfs/branches/branch-0.22/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/CHANGES.txt?rev=1101739&r1=1101738&r2=1101739&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/hdfs/branches/branch-0.22/CHANGES.txt Wed May 11 04:10:59 2011
@@ -493,6 +493,9 @@ Release 0.22.0 - Unreleased
HDFS-1909. TestHDFSCLI fails due to typo in expected output. (tomwhite)
+ HDFS-1544. Ivy resolve force mode should be turned off by default.
+ (Luke Lu via tomwhite)
+
Release 0.21.1 - Unreleased
IMPROVEMENTS
Modified: hadoop/hdfs/branches/branch-0.22/ivy/ivysettings.xml
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/ivy/ivysettings.xml?rev=1101739&r1=1101738&r2=1101739&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/ivy/ivysettings.xml (original)
+++ hadoop/hdfs/branches/branch-0.22/ivy/ivysettings.xml Wed May 11 04:10:59
2011
@@ -35,6 +35,7 @@
<property name="repo.dir" value="${user.home}/.m2/repository"/>
<property name="maven2.pattern.ext" value="${maven2.pattern}.[ext]"/>
<property name="resolvers" value="default" override="false"/>
+ <property name="force-resolve" value="false" override="false"/>
<settings defaultResolver="${resolvers}"/>
<resolvers>
@@ -42,7 +43,7 @@
<ibiblio name="apache-snapshot" root="${snapshot.apache.org}"
m2compatible="true"
checkmodified="true" changingPattern=".*SNAPSHOT"/>
- <filesystem name="fs" m2compatible="true" force="true">
+ <filesystem name="fs" m2compatible="true" force="${force-resolve}">
<artifact
pattern="${repo.dir}/[organisation]/[module]/[revision]/[module]-[revision].[ext]"/>
<ivy
pattern="${repo.dir}/[organisation]/[module]/[revision]/[module]-[revision].pom"/>
</filesystem>
