helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kisho...@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix
Date Mon, 01 Apr 2013 18:22:27 GMT
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/94eb5324
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/94eb5324
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/94eb5324

Branch: refs/heads/master
Commit: 94eb5324c8050edfacec52694a91746329abd9c2
Parents: 0f4c0f1 cd8272c
Author: Kishore Gopalakrishna <g.kishore@gmail.com>
Authored: Mon Apr 1 11:18:45 2013 -0700
Committer: Kishore Gopalakrishna <g.kishore@gmail.com>
Committed: Mon Apr 1 11:18:45 2013 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/helix/HelixConstants.java |    4 +-
 .../java/org/apache/helix/HelixDefinedState.java   |   43 +++
 .../stages/BestPossibleStateCalcStage.java         |   37 ++--
 .../controller/stages/BestPossibleStateOutput.java |    4 +
 .../stages/ExternalViewComputeStage.java           |    3 +-
 .../controller/stages/ReadClusterDataStage.java    |    6 +-
 .../controller/stages/TaskAssignmentStage.java     |    2 +-
 .../org/apache/helix/manager/zk/ZKHelixAdmin.java  |   37 ++--
 .../messaging/handling/BatchMessageHandler.java    |    2 +-
 .../messaging/handling/HelixBatchMessageTask.java  |    2 +-
 .../handling/HelixStateTransitionHandler.java      |  144 ++++++-----
 .../apache/helix/messaging/handling/HelixTask.java |   10 +-
 .../helix/messaging/handling/HelixTaskResult.java  |    2 +-
 .../org/apache/helix/model/InstanceConfig.java     |   19 +--
 .../apache/helix/model/StateModelDefinition.java   |   53 ++++-
 .../helix/monitoring/mbeans/ResourceMonitor.java   |    3 +-
 .../helix/participant/statemachine/StateModel.java |   15 +-
 .../participant/statemachine/StateModelParser.java |    2 +-
 .../apache/helix/tools/ClusterStateVerifier.java   |   26 ++-
 .../helix/tools/StateModelConfigGenerator.java     |    1 +
 .../org/apache/helix/integration/TestDrop.java     |  203 ++++++++++++++-
 .../integration/TestStateTransitionTimeout.java    |    2 +-
 .../helix/mock/participant/MockMSStateModel.java   |   25 ++-
 .../helix/mock/participant/MockTransition.java     |    2 +-
 .../helix/mock/participant/SleepTransition.java    |    9 +-
 .../participant/StoreAccessDiffNodeTransition.java |    2 +-
 .../participant/StoreAccessOneNodeTransition.java  |    2 +-
 .../statemachine/TestStateModelParser.java         |   93 +++++++
 28 files changed, 605 insertions(+), 148 deletions(-)
----------------------------------------------------------------------



Mime
View raw message