You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2014/09/10 03:07:53 UTC

[3/6] git commit: HADOOP-10925. Change attribution in CHANGES.txt from trunk to 2.6.0.

HADOOP-10925. Change attribution in CHANGES.txt from trunk to 2.6.0.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3e8f353c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3e8f353c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3e8f353c

Branch: refs/heads/HDFS-6581
Commit: 3e8f353c8e36b1467af4a8a421097afa512b324c
Parents: 9b81045
Author: cnauroth <cn...@apache.org>
Authored: Tue Sep 9 14:16:41 2014 -0700
Committer: cnauroth <cn...@apache.org>
Committed: Tue Sep 9 14:16:41 2014 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/3e8f353c/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 0417b0a..75ad7db 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