You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cm...@apache.org on 2014/11/05 19:55:54 UTC

git commit: CHANGES.txt. Move HDFS-7199 to branch-2.6

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 6f7ce842c -> af3694b39


CHANGES.txt.  Move HDFS-7199 to branch-2.6


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/af3694b3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/af3694b3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/af3694b3

Branch: refs/heads/branch-2
Commit: af3694b392eb441f511206257dfbeba8ec790324
Parents: 6f7ce84
Author: Colin Patrick Mccabe <cm...@cloudera.com>
Authored: Wed Nov 5 10:55:36 2014 -0800
Committer: Colin Patrick Mccabe <cm...@cloudera.com>
Committed: Wed Nov 5 10:55:36 2014 -0800

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/af3694b3/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index d148b86..9888323 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -145,9 +145,6 @@ Release 2.7.0 - UNRELEASED
     HDFS-7324. haadmin command usage prints incorrect command name.
     (Brahma Reddy Battula via suresh)
 
-    HDFS-7199.  DFSOutputStream should not silently drop data if DataStreamer
-    crashes with an unchecked exception (rushabhs via cmccabe)
-
 Release 2.6.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -763,6 +760,9 @@ Release 2.6.0 - UNRELEASED
     HDFS-7218. FSNamesystem ACL operations should write to audit log on
     failure. (clamb via yliu)
 
+    HDFS-7199.  DFSOutputStream should not silently drop data if DataStreamer
+    crashes with an unchecked exception (rushabhs via cmccabe)
+
     BREAKDOWN OF HDFS-6581 SUBTASKS AND RELATED JIRAS
   
       HDFS-6921. Add LazyPersist flag to FileStatus. (Arpit Agarwal)