From ba44099f8e538ab34ab0d0014d291dd7e901ebb9 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. (cherry picked from commit 3e8f353c8e36b1467af4a8a421097afa512b324c) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 89e3bb878ea..b8c687415d9 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -436,6 +436,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