From ee55d1e74445f403ce06c0a5457265c1b2544172 Mon Sep 17 00:00:00 2001
From: Gary Helmling <garyh@apache.org>
Date: Thu, 25 Aug 2011 03:37:34 +0000
Subject: [PATCH] Amend HBASE-4222  Fix release version, now for 0.90.5, and
 fix for intermittent test failure

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1161374 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                                     | 2 +-
 .../apache/hadoop/hbase/regionserver/wal/TestLogRolling.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3368962093c..457aed9d381 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -401,7 +401,6 @@ Release 0.91.0 - Unreleased
    HBASE-4199  blockCache summary - backend (Doug Meil)
    HBASE-4240  Allow Loadbalancer to be pluggable
    HBASE-4244  Refactor bin/hbase help
-   HBASE-4222  Make HLog more resilient to write pipeline failures
 
   TASKS
    HBASE-3559  Move report of split to master OFF the heartbeat channel
@@ -479,6 +478,7 @@ Release 0.90.5 - Unreleased
 
   IMPROVEMENT
    HBASE-4205  Enhance HTable javadoc (Eric Charles)
+   HBASE-4222  Make HLog more resilient to write pipeline failures
 
 Release 0.90.4 - August 10, 2011
 
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java b/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
index 8856b932b6e..cca86d9729d 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
@@ -474,7 +474,7 @@ public class TestLogRolling  {
     writeData(table, 5);
 
     // force a log roll to read back and verify previously written logs
-    log.rollWriter();
+    log.rollWriter(true);
 
     // read back the data written
     Set<String> loggedRows = new HashSet<String>();