From 92de44c2c58321c12bd8796859d54638e3cba9bd Mon Sep 17 00:00:00 2001 From: Karthik Kambatla Date: Mon, 10 Nov 2014 15:22:53 -0800 Subject: [PATCH] Set the release date for 2.5.2 (cherry picked from commit 68a050872896f93582f95420dd6e2bdefa4fd7cc) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt --- hadoop-common-project/hadoop-common/CHANGES.txt | 2 +- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 +- hadoop-mapreduce-project/CHANGES.txt | 2 +- hadoop-yarn-project/CHANGES.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 99b46282044..714e77f9be1 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -758,7 +758,7 @@ Release 2.6.0 - 2014-11-15 HADOOP-11282. Skip NFS TestShellBasedIdMapping tests that are irrelevant on Windows. (cnauroth) -Release 2.5.2 - UNRELEASED +Release 2.5.2 - 2014-11-10 INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index e261cba63f9..d799fc467e6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1273,7 +1273,7 @@ Release 2.6.0 - 2014-11-15 HDFS-7382. DataNode in secure mode may throw NullPointerException if client connects before DataNode registers itself with NameNode. (cnauroth) -Release 2.5.2 - UNRELEASED +Release 2.5.2 - 2014-11-10 INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index ca6b640c1fc..2caa82829f8 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -246,7 +246,7 @@ Release 2.6.0 - 2014-11-15 MAPREDUCE-5958. Wrong reduce task progress if map output is compressed (Emilio Coppa and jlowe via kihwal) -Release 2.5.2 - UNRELEASED +Release 2.5.2 - 2014-11-10 INCOMPATIBLE CHANGES diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 86c9f7efb4c..9d6cf1a366a 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -902,7 +902,7 @@ Release 2.6.0 - 2014-11-15 consistent with the (somewhat incorrect) behaviour in the non-recovery case. (Jian He via vinodkv) -Release 2.5.2 - UNRELEASED +Release 2.5.2 - 2014-11-10 INCOMPATIBLE CHANGES