hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1065865 - in /hadoop/mapreduce/branches/branch-0.22: ./ conf/ src/c++/ src/c++/pipes/ src/c++/pipes/impl/ src/c++/task-controller/ src/c++/utils/ src/c++/utils/impl/ src/contrib/ src/contrib/block_forensics/ src/contrib/capacity-scheduler/...
Date Mon, 31 Jan 2011 23:48:54 GMT
Author: eli
Date: Mon Jan 31 23:48:52 2011
New Revision: 1065865

URL: http://svn.apache.org/viewvc?rev=1065865&view=rev
Log:
MAPREDUCE-2260. svn merge -c 1065861 from trunk


Added:
    hadoop/mapreduce/branches/branch-0.22/src/c++/task-controller/.autom4te.cfg
      - copied unchanged from r1065861, hadoop/mapreduce/trunk/src/c++/task-controller/.autom4te.cfg
    hadoop/mapreduce/branches/branch-0.22/src/c++/task-controller/Makefile.am
      - copied unchanged from r1065861, hadoop/mapreduce/trunk/src/c++/task-controller/Makefile.am
    hadoop/mapreduce/branches/branch-0.22/src/c++/task-controller/configuration.h
      - copied unchanged from r1065861, hadoop/mapreduce/trunk/src/c++/task-controller/configuration.h
Removed:
    hadoop/mapreduce/branches/branch-0.22/src/c++/pipes/Makefile.in
    hadoop/mapreduce/branches/branch-0.22/src/c++/pipes/aclocal.m4
    hadoop/mapreduce/branches/branch-0.22/src/c++/pipes/compile
    hadoop/mapreduce/branches/branch-0.22/src/c++/pipes/config.guess
    hadoop/mapreduce/branches/branch-0.22/src/c++/pipes/config.sub
    hadoop/mapreduce/branches/branch-0.22/src/c++/pipes/configure
    hadoop/mapreduce/branches/branch-0.22/src/c++/pipes/depcomp
    hadoop/mapreduce/branches/branch-0.22/src/c++/pipes/impl/config.h.in
    hadoop/mapreduce/branches/branch-0.22/src/c++/pipes/install-sh
    hadoop/mapreduce/branches/branch-0.22/src/c++/pipes/ltmain.sh
    hadoop/mapreduce/branches/branch-0.22/src/c++/pipes/missing
    hadoop/mapreduce/branches/branch-0.22/src/c++/task-controller/Makefile.in
    hadoop/mapreduce/branches/branch-0.22/src/c++/task-controller/configuration.h.in
    hadoop/mapreduce/branches/branch-0.22/src/c++/task-controller/configure
    hadoop/mapreduce/branches/branch-0.22/src/c++/utils/Makefile.in
    hadoop/mapreduce/branches/branch-0.22/src/c++/utils/aclocal.m4
    hadoop/mapreduce/branches/branch-0.22/src/c++/utils/config.guess
    hadoop/mapreduce/branches/branch-0.22/src/c++/utils/config.sub
    hadoop/mapreduce/branches/branch-0.22/src/c++/utils/configure
    hadoop/mapreduce/branches/branch-0.22/src/c++/utils/depcomp
    hadoop/mapreduce/branches/branch-0.22/src/c++/utils/impl/config.h.in
    hadoop/mapreduce/branches/branch-0.22/src/c++/utils/install-sh
    hadoop/mapreduce/branches/branch-0.22/src/c++/utils/ltmain.sh
    hadoop/mapreduce/branches/branch-0.22/src/c++/utils/missing
    hadoop/mapreduce/branches/branch-0.22/src/examples/pipes/Makefile.in
    hadoop/mapreduce/branches/branch-0.22/src/examples/pipes/aclocal.m4
    hadoop/mapreduce/branches/branch-0.22/src/examples/pipes/config.guess
    hadoop/mapreduce/branches/branch-0.22/src/examples/pipes/config.sub
    hadoop/mapreduce/branches/branch-0.22/src/examples/pipes/configure
    hadoop/mapreduce/branches/branch-0.22/src/examples/pipes/depcomp
    hadoop/mapreduce/branches/branch-0.22/src/examples/pipes/impl/config.h.in
    hadoop/mapreduce/branches/branch-0.22/src/examples/pipes/install-sh
    hadoop/mapreduce/branches/branch-0.22/src/examples/pipes/ltmain.sh
    hadoop/mapreduce/branches/branch-0.22/src/examples/pipes/missing
Modified:
    hadoop/mapreduce/branches/branch-0.22/   (props changed)
    hadoop/mapreduce/branches/branch-0.22/.gitignore   (props changed)
    hadoop/mapreduce/branches/branch-0.22/CHANGES.txt   (contents, props changed)
    hadoop/mapreduce/branches/branch-0.22/build.xml
    hadoop/mapreduce/branches/branch-0.22/conf/   (props changed)
    hadoop/mapreduce/branches/branch-0.22/conf/capacity-scheduler.xml.template   (props changed)
    hadoop/mapreduce/branches/branch-0.22/src/c++/   (props changed)
    hadoop/mapreduce/branches/branch-0.22/src/c++/pipes/configure.ac
    hadoop/mapreduce/branches/branch-0.22/src/c++/task-controller/configure.ac
    hadoop/mapreduce/branches/branch-0.22/src/c++/utils/configure.ac
    hadoop/mapreduce/branches/branch-0.22/src/contrib/   (props changed)
    hadoop/mapreduce/branches/branch-0.22/src/contrib/block_forensics/   (props changed)
    hadoop/mapreduce/branches/branch-0.22/src/contrib/build-contrib.xml   (props changed)
    hadoop/mapreduce/branches/branch-0.22/src/contrib/build.xml   (props changed)
    hadoop/mapreduce/branches/branch-0.22/src/contrib/capacity-scheduler/   (props changed)
    hadoop/mapreduce/branches/branch-0.22/src/contrib/data_join/   (props changed)
    hadoop/mapreduce/branches/branch-0.22/src/contrib/dynamic-scheduler/   (props changed)
    hadoop/mapreduce/branches/branch-0.22/src/contrib/eclipse-plugin/   (props changed)
    hadoop/mapreduce/branches/branch-0.22/src/contrib/fairscheduler/   (props changed)
    hadoop/mapreduce/branches/branch-0.22/src/contrib/index/   (props changed)
    hadoop/mapreduce/branches/branch-0.22/src/contrib/mrunit/   (props changed)
    hadoop/mapreduce/branches/branch-0.22/src/contrib/streaming/   (props changed)
    hadoop/mapreduce/branches/branch-0.22/src/contrib/vaidya/   (props changed)
    hadoop/mapreduce/branches/branch-0.22/src/examples/   (props changed)
    hadoop/mapreduce/branches/branch-0.22/src/examples/pipes/configure.ac
    hadoop/mapreduce/branches/branch-0.22/src/java/   (props changed)
    hadoop/mapreduce/branches/branch-0.22/src/test/mapred/   (props changed)
    hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/fs/   (props changed)
    hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/hdfs/   (props
changed)
    hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/io/FileBench.java
  (props changed)
    hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java
  (props changed)
    hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/ipc/   (props
changed)
    hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java
  (props changed)
    hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java
  (props changed)
    hadoop/mapreduce/branches/branch-0.22/src/webapps/job/   (props changed)

Propchange: hadoop/mapreduce/branches/branch-0.22/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,2 +1,2 @@
 /hadoop/core/branches/branch-0.19/mapred:713112
-/hadoop/mapreduce/trunk:1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk:1037075,1052106,1053730,1054873,1065861

Propchange: hadoop/mapreduce/branches/branch-0.22/.gitignore
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/.gitignore:713112
 /hadoop/core/trunk/.gitignore:784664-785643
-/hadoop/mapreduce/trunk/.gitignore:1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/.gitignore:1037075,1052106,1053730,1054873,1065861

Modified: hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/CHANGES.txt?rev=1065865&r1=1065864&r2=1065865&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.22/CHANGES.txt Mon Jan 31 23:48:52 2011
@@ -180,6 +180,8 @@ Release 0.22.0 - Unreleased
 
     MAPREDUCE-2180. Add coverage of fair scheduler servlet to system test (todd)
 
+    MAPREDUCE-2260. Remove auto-generated native build files. (rvs via eli)
+
   OPTIMIZATIONS
 
     MAPREDUCE-1354. Enhancements to JobTracker for better performance and

Propchange: hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/CHANGES.txt:713112
 /hadoop/mapreduce/branches/HDFS-641/CHANGES.txt:817878-835964
-/hadoop/mapreduce/trunk/CHANGES.txt:1037075,1052106,1053730,1054873,1057495
+/hadoop/mapreduce/trunk/CHANGES.txt:1037075,1052106,1053730,1054873,1057495,1065861

Modified: hadoop/mapreduce/branches/branch-0.22/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/build.xml?rev=1065865&r1=1065864&r2=1065865&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/build.xml (original)
+++ hadoop/mapreduce/branches/branch-0.22/build.xml Mon Jan 31 23:48:52 2011
@@ -1654,20 +1654,63 @@
     </chmod>
   </target>
  
-  <target name="create-c++-configure" depends="init" if="compile.c++">
+  <target name="check-c++-configure" depends="init" if="compile.c++">
+    <condition property="need.c++.utils.configure">
+       <not> <available file="${c++.utils.src}/configure"/> </not>
+    </condition>
+    <condition property="need.c++.pipes.configure">
+       <not> <available file="${c++.pipes.src}/configure"/> </not>
+    </condition>
+    <condition property="need.c++.examples.pipes.configure">
+       <not> <available file="${c++.examples.pipes.src}/configure"/> </not>
+    </condition>
+    <condition property="need.c++.task-controller.configure">
+       <not> <available file="${c++.task-controller.src}/configure"/> </not>
+    </condition>
+  </target>
+
+  <target name="create-c++-utils-configure" depends="check-c++-configure" 
+                                            if="need.c++.utils.configure">
     <exec executable="autoreconf" dir="${c++.utils.src}" searchpath="yes" 
           failonerror="yes">
-       <arg value="-if"/>
+       <arg value="-i"/>
+       <arg value="-f"/>
     </exec>
+  </target>
+
+  <target name="create-c++-pipes-configure" depends="check-c++-configure" 
+                                            if="need.c++.pipes.configure">
     <exec executable="autoreconf" dir="${c++.pipes.src}" searchpath="yes" 
           failonerror="yes">
-       <arg value="-if"/>
+       <arg value="-i"/>
+       <arg value="-f"/>
     </exec>
+  </target>
+
+  <target name="create-c++-examples-pipes-configure" depends="check-c++-configure" 
+                                            if="need.c++.examples.pipes.configure">
     <exec executable="autoreconf" dir="${c++.examples.pipes.src}" 
           searchpath="yes" failonerror="yes">
-       <arg value="-if"/>
+       <arg value="-i"/>
+       <arg value="-f"/>
+    </exec>
+  </target>
+
+  <target name="create-c++-task-controller-configure" depends="check-c++-configure" 
+                                            if="need.c++.task-controller.configure">
+    <exec executable="autoreconf" dir="${c++.task-controller.src}" 
+          searchpath="yes" failonerror="yes">
+       <arg value="-i"/>
+       <arg value="-f"/>
     </exec>
-   </target>
+  </target>
+
+  <target name="create-c++-configure" depends="create-c++-utils-configure,
+                                               create-c++-pipes-configure,
+                                               create-c++-examples-pipes-configure,
+                                               create-c++-task-controller-configure" 
+                                      if="compile.c++">
+  </target>
    
   <target name="check-c++-makefiles" depends="init" if="compile.c++">
     <condition property="need.c++.utils.makefile">
@@ -1683,6 +1726,7 @@
 
   <target name="create-c++-utils-makefile" depends="check-c++-makefiles" 
                                            if="need.c++.utils.makefile">
+    <antcall target="create-c++-utils-configure"/>
     <mkdir dir="${build.c++.utils}"/>
     <chmod file="${c++.utils.src}/configure" perm="ugo+x"/>
     <exec executable="${c++.utils.src}/configure" dir="${build.c++.utils}"
@@ -1701,6 +1745,7 @@
 
   <target name="create-c++-pipes-makefile" depends="check-c++-makefiles" 
                                            if="need.c++.pipes.makefile">
+    <antcall target="create-c++-pipes-configure"/>
     <mkdir dir="${build.c++.pipes}"/>
     <chmod file="${c++.pipes.src}/configure" perm="ugo+x"/>
     <exec executable="${c++.pipes.src}/configure" dir="${build.c++.pipes}"
@@ -1724,6 +1769,7 @@
   <target name="create-c++-examples-pipes-makefile" 
           depends="check-c++-makefiles" 
           if="need.c++.examples.pipes.makefile">
+    <antcall target="create-c++-examples-pipes-configure"/>
     <mkdir dir="${build.c++.examples.pipes}"/>
     <chmod file="${c++.examples.pipes.src}/configure" perm="ugo+x"/>
     <exec executable="${c++.examples.pipes.src}/configure" 
@@ -2105,6 +2151,7 @@
 
   <!-- taskcontroller targets -->
   <target name="init-task-controller-build">
+    <antcall target="create-c++-task-controller-configure"/>
     <mkdir dir="${build.c++.task-controller}" />
     <copy todir="${build.c++.task-controller}">
       <fileset dir="${c++.task-controller.src}" includes="*.c"/>

Propchange: hadoop/mapreduce/branches/branch-0.22/conf/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/conf:713112
 /hadoop/core/trunk/conf:784664-785643
-/hadoop/mapreduce/trunk/conf:1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/conf:1037075,1052106,1053730,1054873,1065861

Propchange: hadoop/mapreduce/branches/branch-0.22/conf/capacity-scheduler.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/conf/capacity-scheduler.xml.template:713112
 /hadoop/core/trunk/conf/capacity-scheduler.xml.template:776175-785643
-/hadoop/mapreduce/trunk/conf/capacity-scheduler.xml.template:1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/conf/capacity-scheduler.xml.template:1037075,1052106,1053730,1054873,1065861

Propchange: hadoop/mapreduce/branches/branch-0.22/src/c++/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/c++:713112
 /hadoop/core/trunk/src/c++:776175-784663
-/hadoop/mapreduce/trunk/src/c++:1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/src/c++:1037075,1052106,1053730,1054873,1065861

Modified: hadoop/mapreduce/branches/branch-0.22/src/c++/pipes/configure.ac
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/src/c%2B%2B/pipes/configure.ac?rev=1065865&r1=1065864&r2=1065865&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/src/c++/pipes/configure.ac (original)
+++ hadoop/mapreduce/branches/branch-0.22/src/c++/pipes/configure.ac Mon Jan 31 23:48:52 2011
@@ -20,6 +20,9 @@
 AC_PREREQ(2.59)
 AC_INIT(hadoop-pipes, 0.13.0, omalley@apache.org)
 
+AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIR([../utils/m4])
+
 AM_INIT_AUTOMAKE([subdir-objects foreign no-dist])
 
 AC_CONFIG_SRCDIR([impl/HadoopPipes.cc])

Modified: hadoop/mapreduce/branches/branch-0.22/src/c++/task-controller/configure.ac
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/src/c%2B%2B/task-controller/configure.ac?rev=1065865&r1=1065864&r2=1065865&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/src/c++/task-controller/configure.ac (original)
+++ hadoop/mapreduce/branches/branch-0.22/src/c++/task-controller/configure.ac Mon Jan 31
23:48:52 2011
@@ -29,7 +29,9 @@ AC_PREFIX_DEFAULT(.)
 #add new argument called -with-confdir
 AC_ARG_WITH(confdir,[--with-confdir path to hadoop conf dir])
 AC_CONFIG_SRCDIR([task-controller.h])
-AC_CONFIG_HEADER([configuration.h])
+AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIR([../utils/m4])
+AM_INIT_AUTOMAKE([subdir-objects foreign no-dist])
 
 # Checks for programs.
 AC_PROG_CC
@@ -45,7 +47,7 @@ AC_CHECK_HEADERS([stdlib.h string.h unis
 
 if test "$with_confdir" != ""
 then
-AC_DEFINE_UNQUOTED(HADOOP_CONF_DIR,"$with_confdir")
+AC_DEFINE_UNQUOTED(HADOOP_CONF_DIR, ["$with_confdir"], [Location of Hadoop configuration])
 fi
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST

Modified: hadoop/mapreduce/branches/branch-0.22/src/c++/utils/configure.ac
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/src/c%2B%2B/utils/configure.ac?rev=1065865&r1=1065864&r2=1065865&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/src/c++/utils/configure.ac (original)
+++ hadoop/mapreduce/branches/branch-0.22/src/c++/utils/configure.ac Mon Jan 31 23:48:52 2011
@@ -20,6 +20,9 @@
 AC_PREREQ(2.59)
 AC_INIT(hadoop-utils, 0.13.0, omalley@apache.org)
 
+AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIR([m4])
+
 AM_INIT_AUTOMAKE([subdir-objects foreign no-dist])
 
 AC_CONFIG_SRCDIR([impl/SerialUtils.cc])

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib:713112
 /hadoop/core/trunk/src/contrib:784664-785643
-/hadoop/mapreduce/trunk/src/contrib:1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/src/contrib:1037075,1052106,1053730,1054873,1065861

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/block_forensics/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,2 +1,2 @@
 /hadoop/core/branches/branch-0.19/hdfs/src/contrib/block_forensics:713112
-/hadoop/mapreduce/trunk/src/contrib/block_forensics:1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/src/contrib/block_forensics:1037075,1052106,1053730,1054873,1065861

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/build-contrib.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/build-contrib.xml:713112
 /hadoop/core/trunk/src/contrib/build-contrib.xml:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/build-contrib.xml:1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/src/contrib/build-contrib.xml:1037075,1052106,1053730,1054873,1065861

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/build.xml:713112
 /hadoop/core/trunk/src/contrib/build.xml:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/build.xml:1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/src/contrib/build.xml:1037075,1052106,1053730,1054873,1065861

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/capacity-scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/capacity-scheduler:713112
 /hadoop/core/trunk/src/contrib/capacity-scheduler:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/capacity-scheduler:1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/src/contrib/capacity-scheduler:1037075,1052106,1053730,1054873,1065861

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/data_join/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/data_join:713112
 /hadoop/core/trunk/src/contrib/data_join:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/data_join:1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/src/contrib/data_join:1037075,1052106,1053730,1054873,1065861

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/dynamic-scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/src/contrib/dynamic-scheduler:713112
 /hadoop/core/trunk/src/contrib/dynamic-scheduler:784975-786373
-/hadoop/mapreduce/trunk/src/contrib/dynamic-scheduler:1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/src/contrib/dynamic-scheduler:1037075,1052106,1053730,1054873,1065861

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/eclipse-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/core/src/contrib/eclipse-plugin:713112
 /hadoop/core/trunk/src/contrib/eclipse-plugin:776175-784663
-/hadoop/mapreduce/trunk/src/contrib/eclipse-plugin:1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/src/contrib/eclipse-plugin:1037075,1052106,1053730,1054873,1065861

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/fairscheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/fairscheduler:713112
 /hadoop/core/trunk/src/contrib/fairscheduler:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/fairscheduler:1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/src/contrib/fairscheduler:1037075,1052106,1053730,1054873,1065861

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/index/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/index:713112
 /hadoop/core/trunk/src/contrib/index:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/index:1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/src/contrib/index:1037075,1052106,1053730,1054873,1065861

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/mrunit/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/mrunit:713112
 /hadoop/core/trunk/src/contrib/mrunit:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/mrunit:1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/src/contrib/mrunit:1037075,1052106,1053730,1054873,1065861

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/streaming/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/streaming:713112
 /hadoop/core/trunk/src/contrib/streaming:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/streaming:1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/src/contrib/streaming:1037075,1052106,1053730,1054873,1065861

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/vaidya/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/vaidya:713112
 /hadoop/core/trunk/src/contrib/vaidya:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/vaidya:1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/src/contrib/vaidya:1037075,1052106,1053730,1054873,1065861

Propchange: hadoop/mapreduce/branches/branch-0.22/src/examples/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/examples:713112
 /hadoop/core/trunk/src/examples:776175-784663
-/hadoop/mapreduce/trunk/src/examples:1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/src/examples:1037075,1052106,1053730,1054873,1065861

Modified: hadoop/mapreduce/branches/branch-0.22/src/examples/pipes/configure.ac
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/src/examples/pipes/configure.ac?rev=1065865&r1=1065864&r2=1065865&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/src/examples/pipes/configure.ac (original)
+++ hadoop/mapreduce/branches/branch-0.22/src/examples/pipes/configure.ac Mon Jan 31 23:48:52
2011
@@ -20,6 +20,9 @@
 AC_PREREQ(2.59)
 AC_INIT(hadoop-pipes-examples, 0.13.0, omalley@apache.org)
 
+AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIR([../../c++/utils/m4])
+
 AM_INIT_AUTOMAKE([subdir-objects foreign no-dist])
 
 AC_CONFIG_SRCDIR([impl/wordcount-simple.cc])

Propchange: hadoop/mapreduce/branches/branch-0.22/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/java:713112
 /hadoop/core/trunk/src/mapred:776175-785643
-/hadoop/mapreduce/trunk/src/java:1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/src/java:1037075,1052106,1053730,1054873,1065861

Propchange: hadoop/mapreduce/branches/branch-0.22/src/test/mapred/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/test/mapred:713112
 /hadoop/core/trunk/src/test/mapred:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred:1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/src/test/mapred:1037075,1052106,1053730,1054873,1065861

Propchange: hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/fs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/fs:713112
 /hadoop/core/trunk/src/test/mapred/org/apache/hadoop/fs:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs:817878-835934,1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs:817878-835934,1037075,1052106,1053730,1054873,1065861

Propchange: hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/hdfs:713112
 /hadoop/core/trunk/src/test/mapred/org/apache/hadoop/hdfs:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/hdfs:817878-835934,1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/hdfs:817878-835934,1037075,1052106,1053730,1054873,1065861

Propchange: hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/io/FileBench.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/io/FileBench.java:713112
 /hadoop/core/trunk/src/test/mapred/org/apache/hadoop/io/FileBench.java:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/FileBench.java:817878-835934,1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/FileBench.java:817878-835934,1037075,1052106,1053730,1054873,1065861

Propchange: hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:713112
 /hadoop/core/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:817878-835934,1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:817878-835934,1037075,1052106,1053730,1054873,1065861

Propchange: hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/ipc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,4 +1,4 @@
 /hadoop/core/branches/branch-0.19/hdfs/src/test/hdfs-with-mr/org/apache/hadoop/ipc:713112
 /hadoop/core/trunk/src/test/hdfs-with-mr/org/apache/hadoop/ipc:776175-784663
 /hadoop/hdfs/branches/HDFS-265/src/test/hdfs-with-mr/org/apache/hadoop/ipc:796829-820463
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/ipc:1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/ipc:1037075,1052106,1053730,1054873,1065861

Propchange: hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:713112
 /hadoop/core/trunk/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:817878-835934,1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:817878-835934,1037075,1052106,1053730,1054873,1065861

Propchange: hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:713112
 /hadoop/core/trunk/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:817878-835934,1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:817878-835934,1037075,1052106,1053730,1054873,1065861

Propchange: hadoop/mapreduce/branches/branch-0.22/src/webapps/job/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 31 23:48:52 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/webapps/job:713112
 /hadoop/core/trunk/src/webapps/job:776175-785643
-/hadoop/mapreduce/trunk/src/webapps/job:1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/src/webapps/job:1037075,1052106,1053730,1054873,1065861



Mime
View raw message