From 0d61ef5acb94f76017ff27d1707b4fcb0a9e77b8 Mon Sep 17 00:00:00 2001 From: Arpit Agarwal Date: Mon, 27 Jan 2014 20:04:52 +0000 Subject: [PATCH] Merging r1561819 from trunk to branch-2 to fix CHANGES.txt for HADOOP-10086 and HADOOP-9982 git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561826 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 6 ++++++ hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index a9c4070ae3d..6e0c32670b1 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -266,6 +266,9 @@ Release 2.3.0 - UNRELEASED HADOOP-10248. Property name should be included in the exception where property value is null (Akira AJISAKA via umamahesh) + HADOOP-10086. User document for authentication in secure cluster. + (Masatake Iwasaki via Arpit Agarwal) + OPTIMIZATIONS HADOOP-10142. Avoid groups lookup for unprivileged users such as "dr.who" @@ -347,6 +350,9 @@ Release 2.3.0 - UNRELEASED HADOOP-10167. Mark hadoop-common source as UTF-8 in Maven pom files / refactoring (Mikhail Antonov via cos) + HADOOP-9982. Fix dead links in hadoop site docs. (Akira Ajisaka via Arpit + Agarwal) + Release 2.2.0 - 2013-10-13 INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index a7d641c8f66..b53930f7174 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -696,9 +696,6 @@ Release 2.3.0 - UNRELEASED HDFS-5677. Need error checking for HA cluster configuration. (Vincent Sheffer via cos) - HADOOP-10086. User document for authentication in secure cluster. - (Masatake Iwasaki via Arpit Agarwal) - HDFS-5825. Use FileUtils.copyFile() to implement DFSTestUtils.copyFile(). (Haohui Mai via Arpit Agarwal) @@ -865,9 +862,6 @@ Release 2.3.0 - UNRELEASED HDFS-5343. When cat command is issued on snapshot files getting unexpected result. (Sathish via umamahesh) - HADOOP-9982. Fix dead links in hadoop site docs. (Akira Ajisaka via Arpit - Agarwal) - Release 2.2.0 - 2013-10-13 INCOMPATIBLE CHANGES