Author: shv Date: Tue Jun 14 18:44:34 2011 New Revision: 1135738 URL: http://svn.apache.org/viewvc?rev=1135738&view=rev Log: MAPREDUCE-1251. Merge -c 1135736 from branch-0.20-security to branch-0.20-security-204.
Modified: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt hadoop/common/branches/branch-0.20-security-204/src/c++/pipes/api/hadoop/Pipes.hh hadoop/common/branches/branch-0.20-security-204/src/c++/utils/api/hadoop/SerialUtils.hh Modified: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt?rev=1135738&r1=1135737&r2=1135738&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-204/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.20-security-204/CHANGES.txt Tue Jun 14 18:44:34 2011 @@ -93,6 +93,8 @@ Release 0.20.204.0 - unreleased HDFS-1767. Namenode ignores non-initial block report from datanodes when in safemode during startup. (Matt Foley via suresh) + MAPREDUCE-1251. c++ utils doesn't compile. (Eli Collins via shv) + Release 0.20.203.1 - Unreleased HADOOP-7330. Fix MetricsSourceAdapter to use the value instead of the Modified: hadoop/common/branches/branch-0.20-security-204/src/c++/pipes/api/hadoop/Pipes.hh URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/src/c%2B%2B/pipes/api/hadoop/Pipes.hh?rev=1135738&r1=1135737&r2=1135738&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-204/src/c++/pipes/api/hadoop/Pipes.hh (original) +++ hadoop/common/branches/branch-0.20-security-204/src/c++/pipes/api/hadoop/Pipes.hh Tue Jun 14 18:44:34 2011 @@ -31,6 +31,8 @@ #include <string> #endif +#include <stdint.h> + namespace HadoopPipes { /** Modified: hadoop/common/branches/branch-0.20-security-204/src/c++/utils/api/hadoop/SerialUtils.hh URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/src/c%2B%2B/utils/api/hadoop/SerialUtils.hh?rev=1135738&r1=1135737&r2=1135738&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-204/src/c++/utils/api/hadoop/SerialUtils.hh (original) +++ hadoop/common/branches/branch-0.20-security-204/src/c++/utils/api/hadoop/SerialUtils.hh Tue Jun 14 18:44:34 2011 @@ -19,6 +19,7 @@ #define HADOOP_SERIAL_UTILS_HH #include <string> +#include <stdint.h> namespace HadoopUtils {