Author: szetszwo
Date: Mon Mar 25 04:34:29 2013
New Revision: 1460520
URL: http://svn.apache.org/r1460520
Log:
svn merge -c -1448745 and -1448285 for reverting HADOOP-9112: test-patch should
-1 for @Tests without a timeout
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1460520&r1=1460519&r2=1460520&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Mon Mar
25 04:34:29 2013
@@ -162,9 +162,6 @@ Trunk (Unreleased)
HADOOP-9218 Document the Rpc-wrappers used internally (sanjay Radia)
- HADOOP-9112. test-patch should -1 for @Tests without a timeout
- (Surenkumar Nihalani via bobby)
-
BUG FIXES