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 yj...@apache.org on 2015/06/20 16:34:34 UTC
[2/2] hadoop git commit: Move HDFS-7546 to release 2.7.1 in
CHANGES.txt.
Move HDFS-7546 to release 2.7.1 in CHANGES.txt.
(cherry picked from commit bcb3c40bed572a2dd95ce7201d893d7bf59240d5)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5774b1ff
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5774b1ff
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5774b1ff
Branch: refs/heads/branch-2
Commit: 5774b1ff027f6a769553b3aa0be9e660bec74460
Parents: 92cff56
Author: Yongjun Zhang <yz...@cloudera.com>
Authored: Sat Jun 20 00:39:31 2015 -0700
Committer: Yongjun Zhang <yz...@cloudera.com>
Committed: Sat Jun 20 00:49:17 2015 -0700
----------------------------------------------------------------------
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/5774b1ff/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 e9e23a6..82b8eb3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -316,9 +316,6 @@ Release 2.8.0 - UNRELEASED
do not generate spurious reconfig warnings (Lei (Eddy) Xu via Colin P.
McCabe)
- HDFS-7546. Document, and set an accepting default for
- dfs.namenode.kerberos.principal.pattern (Harsh J via aw)
-
OPTIMIZATIONS
HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than
@@ -626,6 +623,9 @@ Release 2.7.1 - UNRELEASED
HDFS-8361. Choose SSD over DISK in block placement. (szetszwo)
+ HDFS-7546. Document, and set an accepting default for
+ dfs.namenode.kerberos.principal.pattern (Harsh J via aw)
+
OPTIMIZATIONS
BUG FIXES