From a123d02f4190ceadf94a66bc37a89c7f4e2ede51 Mon Sep 17 00:00:00 2001 From: Colin Patrick Mccabe Date: Thu, 11 Sep 2014 11:31:58 -0700 Subject: [PATCH] HADOOP-9540: move CHANGES.txt entry to 2.6 --- 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 3cea14a317c..2ae642cc8a8 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -102,9 +102,6 @@ Trunk (Unreleased) HADOOP-9486. Promoted Windows and Shell related utils from YARN to Hadoop Common. (Chris Nauroth via vinodkv) - HADOOP-9540. Expose the InMemoryS3 and S3N FilesystemStores implementations - for Unit testing. (Hari via stevel) - HADOOP-8844. Add a plaintext fs -text test-case. (Akira AJISAKA via harsh) @@ -511,6 +508,9 @@ Release 2.6.0 - UNRELEASED HADOOP-10758. KMS: add ACLs on per key basis. (tucu) + HADOOP-9540. Expose the InMemoryS3 and S3N FilesystemStores implementations + for Unit testing. (Hari via stevel) + OPTIMIZATIONS HADOOP-10838. Byte array native checksumming. (James Thomas via todd)