helix-commits mailing list archives

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

Branch: refs/heads/master
Commit: ddd47fed0ad4d4d49aeafeb4162185bca5735e38
Parents: d80e409 18088ea
Author: slu2011 <lushi04@gmail.com>
Authored: Mon Apr 22 16:18:24 2013 -0700
Committer: slu2011 <lushi04@gmail.com>
Committed: Mon Apr 22 16:18:24 2013 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/helix/HelixManager.java   |    8 +
 .../org/apache/helix/HelixManagerProperties.java   |  156 ++++++++
 .../controller/stages/CompatibilityCheckStage.java |   88 +----
 .../stages/ResourceComputationStage.java           |    4 +-
 .../controller/stages/TaskAssignmentStage.java     |   46 ++-
 .../apache/helix/manager/zk/ZKHelixManager.java    |   15 +-
 .../java/org/apache/helix/model/IdealState.java    |    9 +-
 .../main/java/org/apache/helix/model/Resource.java |   10 +-
 .../org/apache/helix/tools/PropertiesReader.java   |   60 ---
 .../resources/cluster-manager-version.properties   |    3 +
 .../src/test/java/org/apache/helix/Mocks.java      |   11 +
 .../controller/stages/DummyClusterManager.java     |    7 +
 .../stages/TestCompatibilityCheckStage.java        |   43 +--
 .../apache/helix/integration/TestBatchMessage.java |   86 +++++
 .../helix/participant/MockZKHelixManager.java      |    7 +
 recipes/task-execution/README.md                   |  279 +++------------
 recipes/task-execution/pom.xml                     |    2 +-
 .../helix/taskexecution/RedisTaskResultStore.java  |    2 +-
 .../org/apache/helix/taskexecution/ReportTask.java |    2 +-
 .../apache/helix/taskexecution/TaskCluster.java    |    2 +
 .../helix/taskexecution/TaskExecutionDemo.java     |   17 +-
 .../helix/taskexecution/TaskResultStore.java       |    2 +-
 .../apache/helix/taskexecution/TaskStateModel.java |    2 +
 23 files changed, 437 insertions(+), 424 deletions(-)
----------------------------------------------------------------------



Mime
View raw message