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/06/17 01:00:08 UTC
svn commit: r1136728 - in /hadoop/common/branches/branch-0.20-security-204:
CHANGES.txt src/core/org/apache/hadoop/io/IOUtils.java
Author: omalley
Date: Thu Jun 16 23:00:08 2011
New Revision: 1136728
URL: http://svn.apache.org/viewvc?rev=1136728&view=rev
Log:
HADOOP-7274. Fix typos in IOUtils. (Jonathan Eagles via cdouglas)
Modified:
hadoop/common/branches/branch-0.20-security-204/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.20-security-204/src/core/org/apache/hadoop/io/IOUtils.java
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=1136728&r1=1136727&r2=1136728&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-204/CHANGES.txt Thu Jun 16 23:00:08 2011
@@ -32,6 +32,8 @@ Release 0.20.204.0 - unreleased
HADOOP-7373. Fix {start,stop}-{dfs,mapred} and hadoop-daemons.sh from
trying to use the wrong bin directory. (omalley)
+ HADOOP-7274. Fix typos in IOUtils. (Jonathan Eagles via cdouglas)
+
HADOOP-7369. Fix permissions in tarball for sbin/* and libexec/* (omalley)
MAPREDUCE-2479. Move distributed cache cleanup to a background task,
Propchange: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 16 23:00:08 2011
@@ -1,5 +1,5 @@
/hadoop/common/branches/branch-0.20/CHANGES.txt:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,1044225
-/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1097202,1098837,1100336,1103940,1125139,1125170,1125587,1125589,1127362,1131277,1131286,1131290,1131299,1131737,1134140
+/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1097202,1098837,1100336,1102869,1103940,1125139,1125170,1125587,1125589,1127362,1131277,1131286,1131290,1131299,1131737,1134140
/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097012-1099333,1102071,1128115
/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt:1132788,1133133,1133274,1133282
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
Modified: hadoop/common/branches/branch-0.20-security-204/src/core/org/apache/hadoop/io/IOUtils.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/src/core/org/apache/hadoop/io/IOUtils.java?rev=1136728&r1=1136727&r2=1136728&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/src/core/org/apache/hadoop/io/IOUtils.java (original)
+++ hadoop/common/branches/branch-0.20-security-204/src/core/org/apache/hadoop/io/IOUtils.java Thu Jun 16 23:00:08 2011
@@ -112,7 +112,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;
@@ -129,7 +129,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;
}