You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/05/04 08:18:00 UTC

svn commit: r1099330 - in /hadoop/common/branches/branch-0.20-security-203: CHANGES.txt src/contrib/build-contrib.xml

Author: omalley
Date: Wed May  4 06:17:59 2011
New Revision: 1099330

URL: http://svn.apache.org/viewvc?rev=1099330&view=rev
Log:
HADOOP-7259. Contrib modules should include the build.properties from
the enclosing hadoop directory. (omalley)

Modified:
    hadoop/common/branches/branch-0.20-security-203/CHANGES.txt
    hadoop/common/branches/branch-0.20-security-203/src/contrib/build-contrib.xml

Modified: hadoop/common/branches/branch-0.20-security-203/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt?rev=1099330&r1=1099329&r2=1099330&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-203/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-203/CHANGES.txt Wed May  4 06:17:59 2011
@@ -2,6 +2,9 @@ Hadoop Change Log
 
 Release 0.20.203.0 - unreleased
 
+    HADOOP-7259. Contrib modules should include the build.properties from
+    the enclosing hadoop directory. (omalley)
+
     HADOOP-7253. Update the default configuration to fix security audit log
     and metrics2 property configuration warnings. (omalley)
 

Modified: hadoop/common/branches/branch-0.20-security-203/src/contrib/build-contrib.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-203/src/contrib/build-contrib.xml?rev=1099330&r1=1099329&r2=1099330&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-203/src/contrib/build-contrib.xml (original)
+++ hadoop/common/branches/branch-0.20-security-203/src/contrib/build-contrib.xml Wed May  4 06:17:59 2011
@@ -23,13 +23,14 @@
 
   <property name="name" value="${ant.project.name}"/>
   <property name="root" value="${basedir}"/>
+  <property name="hadoop.root" location="${root}/../../../"/>
 
   <!-- Load all the default properties, and any the user wants    -->
   <!-- to contribute (without having to type -D or edit this file -->
   <property file="${user.home}/${name}.build.properties" />
   <property file="${root}/build.properties" />
+  <property file="${hadoop.root}/build.properties" />
 
-  <property name="hadoop.root" location="${root}/../../../"/>
   <property name="src.dir"  location="${root}/src/java"/>
   <property name="src.test" location="${root}/src/test"/>
   <!-- Property added for contrib system tests -->