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/01 02:42:43 UTC
svn commit: r1040850 - in /hadoop/common/branches/branch-0.22: ./
CHANGES.txt src/contrib/ec2/ src/docs/ src/java/
src/java/org/apache/hadoop/io/IOUtils.java src/test/core/
src/test/core/org/apache/hadoop/io/TestSequenceFile.java
Author: cos
Date: Wed Dec 1 01:42:42 2010
New Revision: 1040850
URL: http://svn.apache.org/viewvc?rev=1040850&view=rev
Log:
HADOOP-7057. svn merge -c 1040849 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/java/org/apache/hadoop/io/IOUtils.java
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 Wed Dec 1 01:42:42 2010
@@ -1,2 +1,2 @@
-/hadoop/common/trunk:1037901,1039952,1040408
+/hadoop/common/trunk:1037901,1039952,1040408,1040849
/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=1040850&r1=1040849&r2=1040850&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/CHANGES.txt Wed Dec 1 01:42:42 2010
@@ -340,6 +340,9 @@ Release 0.22.0 - Unreleased
HADOOP-6496. HttpServer sends wrong content-type for CSS files
(and others). (Todd Lipcon via tomwhite)
+ HADOOP-7057. IOUtils.readFully and IOUtils.skipFully have typo in
+ exception creation's message. (cos)
+
Release 0.21.1 - Unreleased
IMPROVEMENTS
Propchange: hadoop/common/branches/branch-0.22/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 1 01:42:42 2010
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/CHANGES.txt:1037901,1039952,1040408
+/hadoop/common/trunk/CHANGES.txt:1037901,1039952,1040408,1040849
/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 Wed Dec 1 01:42:42 2010
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/contrib/ec2:1037901,1039952,1040408
+/hadoop/common/trunk/src/contrib/ec2:1037901,1039952,1040408,1040849
/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 Wed Dec 1 01:42:42 2010
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/src/docs:1037901,1039952,1040408
+/hadoop/common/trunk/src/docs:1037901,1039952,1040408,1040849
/hadoop/core/branches/branch-0.19/src/docs:713112
Propchange: hadoop/common/branches/branch-0.22/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 1 01:42:42 2010
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/java:1037901,1039952,1040408
+/hadoop/common/trunk/src/java:1037901,1039952,1040408,1040849
/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/java/org/apache/hadoop/io/IOUtils.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/io/IOUtils.java?rev=1040850&r1=1040849&r2=1040850&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/io/IOUtils.java (original)
+++ hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/io/IOUtils.java Wed Dec 1 01:42:42 2010
@@ -115,7 +115,7 @@ public class IOUtils {
while ( toRead > 0 ) {
int ret = in.read( buf, off, toRead );
if ( ret < 0 ) {
- throw new IOException( "Premeture EOF from inputStream");
+ throw new IOException( "Premature EOF from inputStream");
}
toRead -= ret;
off += ret;
@@ -132,7 +132,7 @@ public class IOUtils {
while ( len > 0 ) {
long ret = in.skip( len );
if ( ret < 0 ) {
- throw new IOException( "Premeture EOF from inputStream");
+ throw new IOException( "Premature EOF from inputStream");
}
len -= ret;
}
Propchange: hadoop/common/branches/branch-0.22/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 1 01:42:42 2010
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core:1037901,1039952,1040408
+/hadoop/common/trunk/src/test/core:1037901,1039952,1040408,1040849
/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 Wed Dec 1 01:42:42 2010
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core/org/apache/hadoop/io/TestSequenceFile.java:1037901,1039952,1040408
+/hadoop/common/trunk/src/test/core/org/apache/hadoop/io/TestSequenceFile.java:1037901,1039952,1040408,1040849
/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