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 wa...@apache.org on 2014/10/07 23:59:28 UTC
git commit: Fixup for CHANGES.txt
Repository: hadoop
Updated Branches:
refs/heads/branch-2 52c8ac90e -> 6546c5974
Fixup for CHANGES.txt
(cherry picked from commit 0263656247f31a67347bea4b702869ddce21e7c4)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6546c597
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6546c597
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6546c597
Branch: refs/heads/branch-2
Commit: 6546c59745d50fb53f7ea983014b638c7fea9a25
Parents: 52c8ac9
Author: Andrew Wang <wa...@apache.org>
Authored: Tue Oct 7 14:58:44 2014 -0700
Committer: Andrew Wang <wa...@apache.org>
Committed: Tue Oct 7 14:59:17 2014 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 5 +----
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6546c597/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 4e7627f..1413f2f 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
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6546c597/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 2ec5004..ae1410a 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