Author: hairong
Date: Thu Sep 25 14:41:33 2008
New Revision: 699107
URL: http://svn.apache.org/viewvc?rev=699107&view=rev
Log:
HADOOP-4116. Fixing change log to reflect it is fixed in 0.18.2.
Modified:
hadoop/core/branches/branch-0.19/ (props changed)
hadoop/core/branches/branch-0.19/CHANGES.txt
Propchange: hadoop/core/branches/branch-0.19/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 25 14:41:33 2008
@@ -1 +1 @@
-/hadoop/core/trunk:697306,698176,699056
+/hadoop/core/trunk:697306,698176,699056,699098
Modified: hadoop/core/branches/branch-0.19/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/CHANGES.txt?rev=699107&r1=699106&r2=699107&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Thu Sep 25 14:41:33 2008
@@ -724,14 +724,15 @@
HADOOP-4249. Fix eclipse path to include the hsqldb.jar. (szetszwo via
omalley)
-<<<<<<< .working
- HADOOP-4116. Balancer should provide better resource management. (hairong)
-
-=======
HADOOP-4247. Move InputSampler into org.apache.hadoop.mapred.lib, so that
examples.jar doesn't depend on tools.jar. (omalley)
->>>>>>> .merge-right.r699092
+Release 0.18.2 - Unreleased
+
+ BUG FIXES
+
+ HADOOP-4116. Balancer should provide better resource management. (hairong)
+
Release 0.18.1 - 2008-09-17
IMPROVEMENTS
