Author: tucu
Date: Fri Oct 28 21:19:21 2011
New Revision: 1190582
URL: http://svn.apache.org/viewvc?rev=1190582&view=rev
Log:
Merge -r 1180093:1180094 from trunk to branch. FIXES: HDFS-2322
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/pom.xml
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1190582&r1=1190581&r2=1190582&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Fri Oct 28 21:19:21 2011
@@ -749,6 +749,9 @@ Release 0.23.0 - Unreleased
HDFS-2294. Download of commons-daemon TAR should not be under target (tucu)
+ HDFS-2322. the build fails in Windows because commons-daemon TAR cannot be
+ fetched. (tucu)
+
OPTIMIZATIONS
HDFS-1458. Improve checkpoint performance by avoiding unnecessary image
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/pom.xml?rev=1190582&r1=1190581&r2=1190582&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/pom.xml
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/pom.xml
Fri Oct 28 21:19:21 2011
@@ -311,7 +311,7 @@
<goal>run</goal>
</goals>
<configuration>
- <target>
+ <target unless="windows.build">
<condition property="commons.daemon.os.name" value="darwin">
<os name="Mac OS X"/>
</condition>
@@ -354,6 +354,18 @@
<profiles>
<profile>
+ <id>windows</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <os>
+ <family>windows</family>
+ </os>
+ </activation>
+ <properties>
+ <windows.build>true</windows.build>
+ </properties>
+ </profile>
+ <profile>
<id>native</id>
<activation>
<activeByDefault>false</activeByDefault>
