From 7ac8d8f510306eaf51a7f6096d85419e031b528b Mon Sep 17 00:00:00 2001
From: Yongjun Zhang <yzhang@cloudera.com>
Date: Wed, 25 Nov 2015 08:27:26 -0800
Subject: [PATCH] HDFS-6694. Addendum. Update CHANGES.txt for cherry-picking to
 2.8.

(cherry picked from commit 84d01ad7f43bc498bc2e9d3afe68aed7f4a4d462)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 07328931b0f..4ff439b6487 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1522,6 +1522,10 @@ Release 2.8.0 - UNRELEASED
     HDFS-8335. FSNamesystem should construct FSPermissionChecker only if
     permission is enabled. (Gabor Liptak via wheat9)
 
+    HDFS-6694. TestPipelinesFailover.testPipelineRecoveryStress tests fail
+    intermittently with various symptoms - debugging patch. (Yongjun Zhang via
+    Arpit Agarwal)
+
 Release 2.7.3 - UNRELEASED
 
   INCOMPATIBLE CHANGES