Author: tgraves
Date: Thu Jul 5 19:14:13 2012
New Revision: 1357813
URL: http://svn.apache.org/viewvc?rev=1357813&view=rev
Log:
merge -r 1357810:1357811 from trunk. FIXES: HADOOP-8563
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1357813&r1=1357812&r2=1357813&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Thu Jul 5 19:14:13 2012
@@ -131,6 +131,9 @@ Release 2.0.1-alpha - UNRELEASED
HADOOP-8547. Package hadoop-pipes examples/bin directory (again).
(Colin Patrick McCabe via eli)
+ HADOOP-8563. don't package hadoop-pipes examples/bin
+ (Colin Patrick McCabe via tgraves)
+
BREAKDOWN OF HDFS-3042 SUBTASKS
HADOOP-8220. ZKFailoverController doesn't handle failure to become active
