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/05/22 02:46:53 UTC
svn commit: r947223 - in /hadoop/common/branches/branch-0.21: ./ CHANGES.txt
src/contrib/ec2/ src/docs/ src/java/ src/test/core/
Author: cos
Date: Sat May 22 00:46:52 2010
New Revision: 947223
URL: http://svn.apache.org/viewvc?rev=947223&view=rev
Log:
HADOOP-6760. svn merge -c 947222 from trunk
Modified:
hadoop/common/branches/branch-0.21/ (props changed)
hadoop/common/branches/branch-0.21/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.21/src/contrib/ec2/ (props changed)
hadoop/common/branches/branch-0.21/src/docs/ (props changed)
hadoop/common/branches/branch-0.21/src/java/ (props changed)
hadoop/common/branches/branch-0.21/src/test/core/ (props changed)
Propchange: hadoop/common/branches/branch-0.21/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 22 00:46:52 2010
@@ -1,2 +1,2 @@
-/hadoop/common/trunk:944521,945941-945953,947218
+/hadoop/common/trunk:944521,945941-945953,947218,947222
/hadoop/core/branches/branch-0.19/core:713112
Modified: hadoop/common/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/CHANGES.txt?rev=947223&r1=947222&r2=947223&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.21/CHANGES.txt Sat May 22 00:46:52 2010
@@ -892,9 +892,6 @@ Release 0.21.0 - Unreleased
BUG FIXES
- HADOOP-6760. WebServer shouldn't increase port number in case of negative
- port setting caused by Jetty's race (cos)
-
HADOOP-5379. CBZip2InputStream to throw IOException on data crc error.
(Rodrigo Schmidt via zshao)
@@ -1536,6 +1533,11 @@ Release 0.20.3 - Unreleased
HADOOP-6637. Benchmark for establishing RPC session. (shv)
+ BUG FIXES
+
+ HADOOP-6760. WebServer shouldn't increase port number in case of negative
+ port setting caused by Jetty's race (cos)
+
Release 0.20.2 - 2010-2-16
NEW FEATURES
Propchange: hadoop/common/branches/branch-0.21/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 22 00:46:52 2010
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/CHANGES.txt:944521,945941-945953,947218
+/hadoop/common/trunk/CHANGES.txt:944521,945941-945953,947218,947222
/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.21/src/contrib/ec2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 22 00:46:52 2010
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/contrib/ec2:944521,945941-945953,947218
+/hadoop/common/trunk/src/contrib/ec2:944521,945941-945953,947218,947222
/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.21/src/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 22 00:46:52 2010
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/src/docs:944521,945941-945953,947218
+/hadoop/common/trunk/src/docs:944521,945941-945953,947218,947222
/hadoop/core/branches/branch-0.19/src/docs:713112
Propchange: hadoop/common/branches/branch-0.21/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 22 00:46:52 2010
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/java:944521,945941-945953,947218
+/hadoop/common/trunk/src/java:944521,945941-945953,947218,947222
/hadoop/core/branches/branch-0.19/core/src/java:713112
/hadoop/core/trunk/src/core:776175-785643,785929-786278
Propchange: hadoop/common/branches/branch-0.21/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 22 00:46:52 2010
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core:944521,945941-945953,947218
+/hadoop/common/trunk/src/test/core:944521,945941-945953,947218,947222
/hadoop/core/branches/branch-0.19/core/src/test/core:713112
/hadoop/core/trunk/src/test/core:776175-785643,785929-786278