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 vi...@apache.org on 2015/07/07 14:47:07 UTC
[1/2] hadoop git commit: HADOOP-12186. ActiveStandbyElector shouldn't
call monitorLockNodeAsync multiple times (Contributed by zhihai xu) Moved
CHANGES.txt entry to 2.7.2
Repository: hadoop
Updated Branches:
refs/heads/branch-2 16ca0fcf9 -> 2b99310c3
refs/heads/trunk c40bdb56a -> e0febce0e
HADOOP-12186. ActiveStandbyElector shouldn't call monitorLockNodeAsync multiple times (Contributed by zhihai xu)
Moved CHANGES.txt entry to 2.7.2
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e0febce0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e0febce0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e0febce0
Branch: refs/heads/trunk
Commit: e0febce0e74ec69597376774f771da46834c42b1
Parents: c40bdb5
Author: Vinayakumar B <vi...@apache.org>
Authored: Tue Jul 7 18:13:35 2015 +0530
Committer: Vinayakumar B <vi...@apache.org>
Committed: Tue Jul 7 18:13:35 2015 +0530
----------------------------------------------------------------------
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/e0febce0/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 5d11db9..ee96eee 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -930,9 +930,6 @@ Release 2.8.0 - UNRELEASED
HADOOP-12164. Fix TestMove and TestFsShellReturnCode failed to get command
name using reflection. (Lei (Eddy) Xu)
- HADOOP-12186. ActiveStandbyElector shouldn't call monitorLockNodeAsync
- multiple times (zhihai xu via vinayakumarb)
-
HADOOP-12117. Potential NPE from Configuration#loadProperty with
allowNullValueProperties set. (zhihai xu via vinayakumarb)
@@ -948,6 +945,9 @@ Release 2.7.2 - UNRELEASED
BUG FIXES
+ HADOOP-12186. ActiveStandbyElector shouldn't call monitorLockNodeAsync
+ multiple times (zhihai xu via vinayakumarb)
+
Release 2.7.1 - 2015-07-06
INCOMPATIBLE CHANGES
[2/2] hadoop git commit: HADOOP-12186. ActiveStandbyElector shouldn't
call monitorLockNodeAsync multiple times (Contributed by zhihai xu) Moved
CHANGES.txt entry to 2.7.2
Posted by vi...@apache.org.
HADOOP-12186. ActiveStandbyElector shouldn't call monitorLockNodeAsync multiple times (Contributed by zhihai xu)
Moved CHANGES.txt entry to 2.7.2
(cherry picked from commit e0febce0e74ec69597376774f771da46834c42b1)
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/2b99310c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2b99310c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2b99310c
Branch: refs/heads/branch-2
Commit: 2b99310c32a1593b467ec620a6785de2c8f12359
Parents: 16ca0fc
Author: Vinayakumar B <vi...@apache.org>
Authored: Tue Jul 7 18:13:35 2015 +0530
Committer: Vinayakumar B <vi...@apache.org>
Committed: Tue Jul 7 18:16:14 2015 +0530
----------------------------------------------------------------------
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/2b99310c/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 ce33158..a728b01 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -436,9 +436,6 @@ Release 2.8.0 - UNRELEASED
HADOOP-12173. NetworkTopology::add calls toString always.
(Inigo Goiri via cdouglas)
- HADOOP-12186. ActiveStandbyElector shouldn't call monitorLockNodeAsync
- multiple times (zhihai xu via vinayakumarb)
-
HADOOP-12185. NetworkTopology is not efficient adding/getting/removing
nodes. (Inigo Goiri via cdouglas)
@@ -457,6 +454,9 @@ Release 2.7.2 - UNRELEASED
BUG FIXES
+ HADOOP-12186. ActiveStandbyElector shouldn't call monitorLockNodeAsync
+ multiple times (zhihai xu via vinayakumarb)
+
Release 2.7.1 - 2015-07-06
INCOMPATIBLE CHANGES