Author: acmurthy
Date: Sat Aug 27 19:09:35 2011
New Revision: 1162422
URL: http://svn.apache.org/viewvc?rev=1162422&view=rev
Log:
Merge -r 1162420:1162421 from trunk to branch-0.23 to fix HDFS-2289.
Modified:
hadoop/common/branches/branch-0.23/ (props changed)
hadoop/common/branches/branch-0.23/hadoop-project-dist/ (props changed)
hadoop/common/branches/branch-0.23/hadoop-project/pom.xml
Propchange: hadoop/common/branches/branch-0.23/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 27 19:09:35 2011
@@ -1 +1 @@
-/hadoop/common/trunk:1161777,1161781,1162188
+/hadoop/common/trunk:1161777,1161781,1162188,1162421
Propchange: hadoop/common/branches/branch-0.23/hadoop-project-dist/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 27 19:09:35 2011
@@ -0,0 +1 @@
+target
Modified: hadoop/common/branches/branch-0.23/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-project/pom.xml?rev=1162422&r1=1162421&r2=1162422&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-project/pom.xml Sat Aug 27
19:09:35 2011
@@ -74,6 +74,8 @@
<distMgmtSnapshotsName>Apache Development Snapshot
Repository</distMgmtSnapshotsName>
<distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
+
+ <commons-daemon.version>1.0.3</commons-daemon.version>
</properties>
<dependencyManagement>
@@ -365,7 +367,7 @@
<dependency>
<groupId>commons-daemon</groupId>
<artifactId>commons-daemon</artifactId>
- <version>1.0.1</version>
+ <version>${commons-daemon.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
