Author: szetszwo
Date: Mon May 14 18:19:09 2012
New Revision: 1338327

URL: http://svn.apache.org/viewvc?rev=1338327&view=rev
Log:
svn merge -c 1337415 from trunk for adding HADOOP-8113 to CHANGES.txt.

Modified:
    
hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/  
 (props changed)
    
hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
   (contents, props changed)

Propchange: 
hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1337415

Modified: 
hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1338327&r1=1338326&r2=1338327&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 Mon May 14 18:19:09 2012
@@ -167,6 +167,9 @@ Release 2.0.0 - UNRELEASED
     HADOOP-8353. hadoop-daemon.sh and yarn-daemon.sh can be misleading on stop.
     (Roman Shaposhnik via atm)
 
+    HADOOP-8113. Correction to BUILDING.txt: HDFS needs ProtocolBuffer, too
+    (not just MapReduce). Contributed by Eugene Koontz.
+
   OPTIMIZATIONS
 
   BUG FIXES

Propchange: 
hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
  Merged 
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1337415


Reply via email to