CHANGES.txt: move HADOOP-11887 to trunk

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

Branch: refs/heads/yarn-2877
Commit: 21c0e3eda56b19a6552ffdb59deb7ebeddee8aae
Parents: 46e78a7
Author: Colin Patrick Mccabe <cmcc...@cloudera.com>
Authored: Thu Nov 5 11:12:24 2015 -0800
Committer: Colin Patrick Mccabe <cmcc...@cloudera.com>
Committed: Thu Nov 5 11:12:24 2015 -0800

----------------------------------------------------------------------
 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/21c0e3ed/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 85df389..4035ef8 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -256,6 +256,9 @@ Trunk (Unreleased)
 
     HADOOP-12541. make re2j dependency consistent (Matthew Paduano via aw)
 
+    HADOOP-11887. Introduce Intel ISA-L erasure coding library for native
+    erasure encoding support (Kai Zheng via Colin P. McCabe)
+
   BUG FIXES
 
     HADOOP-11473. test-patch says "-1 overall" even when all checks are +1
@@ -948,9 +951,6 @@ Release 2.8.0 - UNRELEASED
     HADOOP-12040. Adjust inputs order for the decode API in raw erasure coder.
     (Kai Zheng via yliu)
 
-    HADOOP-11887. Introduce Intel ISA-L erasure coding library for native
-    erasure encoding support (Kai Zheng via Colin P. McCabe)
-
   OPTIMIZATIONS
 
     HADOOP-11785. Reduce the number of listStatus operation in distcp

Reply via email to