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/22 05:04:44 UTC
[2/2] helix 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/a0ab2b2e
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/a0ab2b2e
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/a0ab2b2e
Branch: refs/heads/master
Commit: a0ab2b2e34311aab9f2c211970758ffaea8b2397
Parents: bfb4a3d 8e58aa5
Author: Kanak Biscuitwala <ka...@hotmail.com>
Authored: Fri Nov 21 20:01:49 2014 -0800
Committer: Kanak Biscuitwala <ka...@hotmail.com>
Committed: Fri Nov 21 20:01:49 2014 -0800
----------------------------------------------------------------------
.../helix/agent/AgentStateModelFactory.java | 3 +-
.../main/java/org/apache/helix/PropertyKey.java | 9 ++
.../api/StateTransitionHandlerFactory.java | 63 ++++++----
.../handling/HelixStateTransitionHandler.java | 2 +-
.../GenericLeaderStandbyStateModelFactory.java | 4 +-
.../participant/HelixStateMachineEngine.java | 51 ++++----
...usterControllerTransitionHandlerFactory.java | 4 +-
.../statemachine/ScheduledTaskStateModel.java | 9 +-
.../ScheduledTaskStateModelFactory.java | 7 +-
.../helix/task/TaskStateModelFactory.java | 3 +-
.../org/apache/helix/TestHelixTaskExecutor.java | 2 +-
.../org/apache/helix/TestHelixTaskHandler.java | 2 +-
.../TestCorrectnessOnConnectivityLoss.java | 3 +-
.../integration/TestEntropyFreeNodeBounce.java | 16 +++
.../helix/integration/TestHelixConnection.java | 2 +-
.../helix/integration/TestMessageThrottle2.java | 3 +-
.../TestPartitionLevelTransitionConstraint.java | 3 +-
.../integration/TestPreferenceListAsQueue.java | 8 +-
.../TestResourceWithSamePartitionKey.java | 125 +++++++++++++++++++
.../integration/TestStateTransitionTimeout.java | 12 +-
.../helix/integration/TestZkReconnect.java | 2 +-
.../integration/manager/TestStateModelLeak.java | 21 ++--
.../helix/mock/participant/DummyProcess.java | 7 +-
.../participant/MockBootstrapModelFactory.java | 8 +-
.../mock/participant/MockMSModelFactory.java | 12 +-
.../participant/MockSchemataModelFactory.java | 4 +-
...MultiClusterControllerStateModelFactory.java | 3 +-
.../apache/helix/examples/BootstrapHandler.java | 3 +-
.../apache/helix/examples/DummyParticipant.java | 3 +-
.../LeaderStandbyStateModelFactory.java | 3 +-
.../helix/examples/LogicalModelExample.java | 2 +-
.../examples/MasterSlaveStateModelFactory.java | 3 +-
.../OnlineOfflineStateModelFactory.java | 3 +-
.../helix/ipc/TestNettyHelixIPCService.java | 3 +-
.../StatelessServiceStateModelFactory.java | 3 +-
.../apache/helix/lockmanager/LockFactory.java | 3 +-
.../ConsumerTransitionHandlerFactory.java | 3 +-
.../filestore/FileStoreStateModelFactory.java | 3 +-
.../taskexecution/TaskStateModelFactory.java | 3 +-
.../userdefinedrebalancer/LockFactory.java | 3 +-
40 files changed, 324 insertions(+), 102 deletions(-)
----------------------------------------------------------------------