Repository: hadoop Updated Branches: refs/heads/trunk b419c1b2e -> 46509617b
HDFS-6576. Datanode log is generating at root directory in security mode (Contributed by surendra singh lilhore) Just merging CHANGES.txt changes from branch-2 to keep in sync. (cherry picked from commit a87ab77fec375c02ba507bd7c7ca1e0082f623c2) Conflicts: hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/46509617 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/46509617 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/46509617 Branch: refs/heads/trunk Commit: 46509617b6296eeeabf9d99e8ba365040bec05ad Parents: b419c1b Author: Vinayakumar B <vinayakum...@apache.org> Authored: Fri May 8 16:37:36 2015 +0530 Committer: Vinayakumar B <vinayakum...@apache.org> Committed: Fri May 8 16:44:03 2015 +0530 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/46509617/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 e1717e8..c9e5b87 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -687,6 +687,9 @@ Release 2.8.0 - UNRELEASED HDFS-8209. Support different number of datanode directories in MiniDFSCluster. (surendra singh lilhore via vinayakumarb) + HDFS-6576. Datanode log is generating at root directory in security mode + (surendra singh lilhore via vinayakumarb) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES