CHUKWA-801. Increase measurement timeout for TestFailTailer. (Eric Yang)
diff --git a/CHANGES.txt b/CHANGES.txt
index fbc443b..203e95c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,10 @@
 
   BUGS
 
+    CHUKWA-801. Increase measurement timeout for TestFailTailer. (Eric Yang)
+
+    CHUKWA-800. Updated Hadoop, HBase version. (Eric Yang)
+
     CHUKWA-799. Updated jsoup version. (Eric Yang)
 
     CHUKWA-798. Added retry logic for SolrWriter and update to Solr 5.5.0 API (Eric Yang)
diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileTailer.java b/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileTailer.java
index d622b5d..54c4b83 100644
--- a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileTailer.java
+++ b/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileTailer.java
@@ -46,6 +46,7 @@
 
 	@Test
 	public void testDontSleepIfHasMoreData() throws AlreadyRunningException, IOException, InterruptedException {
+		int DEFAULT_SAMPLE_PERIOD_MS = 1000 * 2;
 		ChukwaConfiguration cc = new ChukwaConfiguration();
 		cc.setInt("chukwaAgent.fileTailingAdaptor.maxReadSize", 18); // small in order to have hasMoreData=true
 																	 // (with 26 letters we should have 2 chunks)
@@ -66,7 +67,7 @@
 		chunks.waitForAChunk();
 		
 		long endTime = System.currentTimeMillis();
-		assertTrue( endTime - startTime < 300 ); // ensure that everything finishes very fast
+		assertTrue( endTime - startTime < DEFAULT_SAMPLE_PERIOD_MS ); // ensure that everything finishes very fast
 												 // faster than SAMPLE_PERIOD_MS (ie: we don't sleep)
 	}