You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@helix.apache.org by zz...@apache.org on 2013/11/06 02:56:34 UTC

[3/3] git commit: Merge branch 'helix-logical-model' of https://git-wip-us.apache.org/repos/asf/incubator-helix into helix-logical-model

Merge branch 'helix-logical-model' of https://git-wip-us.apache.org/repos/asf/incubator-helix into helix-logical-model


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

Branch: refs/heads/helix-logical-model
Commit: 53ff1c53db8296b7a066b4dfce63fc5dbc057c8e
Parents: 6210b0d 26a9413
Author: zzhang <zz...@apache.org>
Authored: Tue Nov 5 17:55:52 2013 -0800
Committer: zzhang <zz...@apache.org>
Committed: Tue Nov 5 17:55:52 2013 -0800

----------------------------------------------------------------------
 helix-core/pom.xml                              |  2 +-
 .../helix/api/accessor/ClusterAccessor.java     | 12 +--
 .../helix/api/accessor/ParticipantAccessor.java |  8 +-
 .../helix/api/accessor/ResourceAccessor.java    | 14 ++-
 .../helix/api/config/NamespacedConfig.java      |  8 +-
 .../rebalancer/context/RebalancerConfig.java    | 30 ++++---
 .../helix/model/ClusterConfiguration.java       | 40 ++++++++-
 .../java/org/apache/helix/model/IdealState.java | 18 ++++
 .../org/apache/helix/model/InstanceConfig.java  | 38 ++++++++-
 .../helix/model/ResourceConfiguration.java      | 41 +++++++++
 .../apache/helix/api/TestNamespacedConfig.java  | 89 ++++++++++++++++++++
 11 files changed, 263 insertions(+), 37 deletions(-)
----------------------------------------------------------------------