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/02/19 19:29:23 UTC

[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/helix

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/helix


Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/70c9d76a
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/70c9d76a
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/70c9d76a

Branch: refs/heads/master
Commit: 70c9d76ad3b43812c5d441c31b47f9c6ef3add23
Parents: 7cb6b86 0e310fa
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Wed Feb 19 10:28:59 2014 -0800
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Wed Feb 19 10:28:59 2014 -0800

----------------------------------------------------------------------
 .../api/accessor/AtomicParticipantAccessor.java |  4 +-
 .../api/accessor/AtomicResourceAccessor.java    |  4 +-
 .../helix/api/accessor/ClusterAccessor.java     | 34 ++-------
 .../helix/api/accessor/ParticipantAccessor.java | 34 +++------
 .../helix/api/accessor/ResourceAccessor.java    |  7 +-
 .../controller/GenericHelixController.java      | 12 ++-
 .../stages/PersistAssignmentStage.java          |  4 +-
 .../org/apache/helix/manager/zk/ZKUtil.java     | 79 +++++++++++++-------
 .../helix/manager/zk/ZkHelixConnection.java     | 11 +--
 .../org/apache/helix/tools/NewClusterSetup.java |  6 +-
 .../api/accessor/TestAccessorRecreate.java      |  2 +-
 11 files changed, 100 insertions(+), 97 deletions(-)
----------------------------------------------------------------------