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 co...@apache.org on 2010/12/10 20:52:14 UTC
svn commit: r1044492 - in /hadoop/common/branches/branch-0.22: ./
CHANGES.txt src/contrib/ec2/ src/docs/ src/java/ src/saveVersion.sh
src/test/core/ src/test/core/org/apache/hadoop/io/TestSequenceFile.java
Author: cos
Date: Fri Dec 10 19:52:13 2010
New Revision: 1044492
URL: http://svn.apache.org/viewvc?rev=1044492&view=rev
Log:
HADOOP-7038. svn merge -c 1044490 from trunk
Modified:
hadoop/common/branches/branch-0.22/ (props changed)
hadoop/common/branches/branch-0.22/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.22/src/contrib/ec2/ (props changed)
hadoop/common/branches/branch-0.22/src/docs/ (props changed)
hadoop/common/branches/branch-0.22/src/java/ (props changed)
hadoop/common/branches/branch-0.22/src/saveVersion.sh
hadoop/common/branches/branch-0.22/src/test/core/ (props changed)
hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/io/TestSequenceFile.java (props changed)
Propchange: hadoop/common/branches/branch-0.22/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 10 19:52:13 2010
@@ -1,2 +1,2 @@
-/hadoop/common/trunk:1037901,1039952,1040408,1040849
+/hadoop/common/trunk:1037901,1039952,1040408,1040849,1044490
/hadoop/core/branches/branch-0.19/core:713112
Modified: hadoop/common/branches/branch-0.22/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/CHANGES.txt?rev=1044492&r1=1044491&r2=1044492&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/CHANGES.txt Fri Dec 10 19:52:13 2010
@@ -346,6 +346,9 @@ Release 0.22.0 - Unreleased
HADOOP-7057. IOUtils.readFully and IOUtils.skipFully have typo in
exception creation's message. (cos)
+ HADOOP-7038. saveVersion script includes an additional \r while running
+ whoami under windows. (Wang Xu via cos)
+
Release 0.21.1 - Unreleased
IMPROVEMENTS
Propchange: hadoop/common/branches/branch-0.22/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 10 19:52:13 2010
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/CHANGES.txt:1037901,1039952,1040408,1040849
+/hadoop/common/trunk/CHANGES.txt:1037901,1039952,1040408,1040849,1044490
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278
Propchange: hadoop/common/branches/branch-0.22/src/contrib/ec2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 10 19:52:13 2010
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/contrib/ec2:1037901,1039952,1040408,1040849
+/hadoop/common/trunk/src/contrib/ec2:1037901,1039952,1040408,1040849,1044490
/hadoop/core/branches/branch-0.19/core/src/contrib/ec2:713112
/hadoop/core/trunk/src/contrib/ec2:776175-784663
Propchange: hadoop/common/branches/branch-0.22/src/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 10 19:52:13 2010
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/src/docs:1037901,1039952,1040408,1040849
+/hadoop/common/trunk/src/docs:1037901,1039952,1040408,1040849,1044490
/hadoop/core/branches/branch-0.19/src/docs:713112
Propchange: hadoop/common/branches/branch-0.22/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 10 19:52:13 2010
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/java:1037901,1039952,1040408,1040849
+/hadoop/common/trunk/src/java:1037901,1039952,1040408,1040849,1044490
/hadoop/core/branches/branch-0.19/core/src/java:713112
/hadoop/core/trunk/src/core:776175-785643,785929-786278
Modified: hadoop/common/branches/branch-0.22/src/saveVersion.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/saveVersion.sh?rev=1044492&r1=1044491&r2=1044492&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/src/saveVersion.sh (original)
+++ hadoop/common/branches/branch-0.22/src/saveVersion.sh Fri Dec 10 19:52:13 2010
@@ -23,7 +23,7 @@ unset LC_CTYPE
unset LC_TIME
version=$1
build_dir=$2
-user=`whoami`
+user=`whoami | tr '\n\r' '\n'`
date=`date`
cwd=`pwd`
if [ -d .git ]; then
Propchange: hadoop/common/branches/branch-0.22/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 10 19:52:13 2010
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core:1037901,1039952,1040408,1040849
+/hadoop/common/trunk/src/test/core:1037901,1039952,1040408,1040849,1044490
/hadoop/core/branches/branch-0.19/core/src/test/core:713112
/hadoop/core/trunk/src/test/core:776175-785643,785929-786278
Propchange: hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/io/TestSequenceFile.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 10 19:52:13 2010
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core/org/apache/hadoop/io/TestSequenceFile.java:1037901,1039952,1040408,1040849
+/hadoop/common/trunk/src/test/core/org/apache/hadoop/io/TestSequenceFile.java:1037901,1039952,1040408,1040849,1044490
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/io/TestSequenceFile.java:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFile.java:776175-785643