From 6546c59745d50fb53f7ea983014b638c7fea9a25 Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Tue, 7 Oct 2014 14:58:44 -0700 Subject: [PATCH] Fixup for CHANGES.txt (cherry picked from commit 0263656247f31a67347bea4b702869ddce21e7c4) --- hadoop-common-project/hadoop-common/CHANGES.txt | 5 +---- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 4e7627f3f48..1413f2f6fdf 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -11,10 +11,7 @@ Release 2.7.0 - UNRELEASED HADOOP-11156. DelegateToFileSystem should implement getFsStatus(final Path f). (Zhihai Xu via wang) - HDFS-7186. Document the "hadoop trace" command. (Masatake Iwasaki via Colin - P. McCabe) - - Improve error message in Shell#runCommand on OutOfMemoryError. + HADOOP-11172. Improve error message in Shell#runCommand on OutOfMemoryError. (Yongjun Zhang via wang) OPTIMIZATIONS diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 2ec50048ad8..ae1410a5279 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -10,6 +10,9 @@ Release 2.7.0 - UNRELEASED HDFS-7055. Add tracing to DFSInputStream (cmccabe) + HDFS-7186. Document the "hadoop trace" command. (Masatake Iwasaki via Colin + P. McCabe) + OPTIMIZATIONS BUG FIXES