You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by ka...@apache.org on 2013/11/25 18:33:13 UTC
[1/2] git commit: [HELIX-321] Controller forgets that it's the leader,
rb=15817
Updated Branches:
refs/heads/master 2194542fa -> 2904c8369
[HELIX-321] Controller forgets that it's the leader, rb=15817
Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/bac40bbf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/bac40bbf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/bac40bbf
Branch: refs/heads/master
Commit: bac40bbfb113070997475f706144768d7e6744c6
Parents: d09de23
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Fri Nov 22 17:42:13 2013 -0800
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Mon Nov 25 09:32:43 2013 -0800
----------------------------------------------------------------------
.../java/org/apache/helix/manager/zk/HelixConnectionAdaptor.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/bac40bbf/helix-core/src/main/java/org/apache/helix/manager/zk/HelixConnectionAdaptor.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/HelixConnectionAdaptor.java b/helix-core/src/main/java/org/apache/helix/manager/zk/HelixConnectionAdaptor.java
index ecafbc8..e52427c 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/HelixConnectionAdaptor.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/HelixConnectionAdaptor.java
@@ -69,12 +69,10 @@ public class HelixConnectionAdaptor implements HelixManager {
final InstanceType _instanceType;
final HelixDataAccessor _accessor;
final ClusterMessagingService _messagingService;
- final SessionId _sessionId;
public HelixConnectionAdaptor(HelixRole role) {
_role = role;
_connection = role.getConnection();
- _sessionId = _connection.getSessionId();
_clusterId = role.getClusterId();
_accessor = _connection.createDataAccessor(_clusterId);
@@ -181,7 +179,7 @@ public class HelixConnectionAdaptor implements HelixManager {
@Override
public String getSessionId() {
- return _sessionId.stringify();
+ return _connection.getSessionId().stringify();
}
@Override
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-helix
Posted by ka...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix
Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/2904c836
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/2904c836
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/2904c836
Branch: refs/heads/master
Commit: 2904c83692814db5033a11e9ea0baae2b62c76cc
Parents: bac40bb 2194542
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Mon Nov 25 09:32:59 2013 -0800
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Mon Nov 25 09:32:59 2013 -0800
----------------------------------------------------------------------
.../src/site/xdoc/download.xml.vm | 30 ++-
.../src/site/markdown/Tutorial.md | 26 ++-
.../src/site/xdoc/download.xml.vm | 40 +++-
src/site/apt/releasing.apt | 194 +++++++++++++++++--
src/site/markdown/index.md | 2 +-
src/site/site.xml | 16 +-
src/site/xdoc/download.xml.vm | 40 +++-
7 files changed, 281 insertions(+), 67 deletions(-)
----------------------------------------------------------------------