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 2014/11/19 05:42:34 UTC
[3/4] helix git commit: Merge branch 'HELIX-550' of
https://github.com/atcurtis/helix into helix-0.6.x (resolves #11)
Merge branch 'HELIX-550' of https://github.com/atcurtis/helix into helix-0.6.x (resolves #11)
Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/c85cf826
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/c85cf826
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/c85cf826
Branch: refs/heads/helix-0.6.x
Commit: c85cf8269a51fcc72e166871a21e06de7a6acaff
Parents: 2eaea91 85e78d3
Author: Kanak Biscuitwala <ka...@hotmail.com>
Authored: Tue Nov 18 20:37:43 2014 -0800
Committer: Kanak Biscuitwala <ka...@hotmail.com>
Committed: Tue Nov 18 20:37:43 2014 -0800
----------------------------------------------------------------------
.../controller/GenericHelixController.java | 9 ++++++
.../apache/helix/manager/zk/ZKHelixManager.java | 33 +++++++++++++++++---
2 files changed, 37 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/helix/blob/c85cf826/helix-core/src/main/java/org/apache/helix/controller/GenericHelixController.java
----------------------------------------------------------------------