From 3e8f353c8e36b1467af4a8a421097afa512b324c Mon Sep 17 00:00:00 2001 From: cnauroth Date: Tue, 9 Sep 2014 14:16:41 -0700 Subject: [PATCH] HADOOP-10925. Change attribution in CHANGES.txt from trunk to 2.6.0. --- 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 0417b0a638..75ad7db5b0 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -319,9 +319,6 @@ Trunk (Unreleased) HADOOP-10840. Fix OutOfMemoryError caused by metrics system in Azure File System. (Shanyu Zhao via cnauroth) - HADOOP-10925. Compilation fails in native link0 function on Windows. - (cnauroth) - HADOOP-11002. shell escapes are incompatible with previous releases (aw) HADOOP-10996. Stop violence in the *_HOME (aw) @@ -774,6 +771,9 @@ Release 2.6.0 - UNRELEASED HADOOP-11071. KMSClientProvider should drain the local generated EEK cache on key rollover. (tucu) + HADOOP-10925. Compilation fails in native link0 function on Windows. + (cnauroth) + Release 2.5.1 - UNRELEASED INCOMPATIBLE CHANGES