From 16b7bd4e6cb988762e5afe3b23fc98a8ddd807e1 Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Fri, 15 Aug 2014 05:53:03 +0000 Subject: [PATCH] Move HADOOP-10121 to correct section of CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618105 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 8cd6a359f2..aec02b4f61 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -435,9 +435,6 @@ Trunk (Unreleased) HADOOP-10862. Miscellaneous trivial corrections to KMS classes. (asuresh via tucu) - HADOOP-10121. Fix javadoc spelling for HadoopArchives#writeTopLevelDirs - (Akira AJISAKA via aw) - HADOOP-10967. Improve DefaultCryptoExtension#generateEncryptedKey performance. (hitliuyi via tucu) @@ -594,6 +591,9 @@ Release 2.6.0 - UNRELEASED HADOOP-10843. TestGridmixRecord unit tests failure on PowerPC (Jinghui Wang via Colin Patrick McCabe) + HADOOP-10121. Fix javadoc spelling for HadoopArchives#writeTopLevelDirs + (Akira AJISAKA via aw) + HADOOP-10964. Small fix for NetworkTopologyWithNodeGroup#sortByDistance. (Yi Liu via wang)