Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 0bdb51d80 -> ba7b5f3a5
Updated CHANGES.txt to move HADOOP-12526 to 2.6.3.
(cherry picked from commit f6cecbfce586c4870d0f6b54b9bca2a30af7b9fa)
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ba7b5f3a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ba7b5f3a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ba7b5f3a
Branch: refs/heads/branch-2.7
Commit: ba7b5f3a5dedd58a504c91fcae99cc0bd75d5d31
Parents: 0bdb51d
Author: Tsuyoshi Ozawa <[email protected]>
Authored: Wed Nov 11 23:18:55 2015 +0900
Committer: Tsuyoshi Ozawa <[email protected]>
Committed: Wed Nov 11 23:23:14 2015 +0900
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ba7b5f3a/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 a90cc3a..e5568aa 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -18,8 +18,6 @@ Release 2.7.3 - UNRELEASED
HADOOP-12296. when setnetgrent returns 0 in linux, exception should be
thrown (Chang Li via jlowe)
- HADOOP-12526. there are duplicate dependency definitions in pom's (sjlee)
-
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES
@@ -832,6 +830,8 @@ Release 2.6.3 - UNRELEASED
BUG FIXES
+ HADOOP-12526. there are duplicate dependency definitions in pom's (sjlee)
+
Release 2.6.2 - 2015-10-28
INCOMPATIBLE CHANGES
