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/05/09 00:59:32 UTC
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-helix
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/55d293d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/55d293d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/55d293d2
Branch: refs/heads/master
Commit: 55d293d237e77206c80bb605391a1ea893d0309d
Parents: f6a2bad 0f19cf1
Author: zzhang <zz...@uci.edu>
Authored: Wed May 8 15:59:00 2013 -0700
Committer: zzhang <zz...@uci.edu>
Committed: Wed May 8 15:59:00 2013 -0700
----------------------------------------------------------------------
helix-admin-webapp/pom.xml | 2 +-
helix-agent/pom.xml | 2 +-
helix-core/pom.xml | 2 +-
.../test/java/org/apache/helix/TestZkBasis.java | 19 +
.../helix/integration/TestAutoRebalance.java | 70 ++++-
mockservice/pom.xml | 2 +-
.../main/java/org/apache/helix/CMConnector.java | 5 +-
pom.xml | 2 +-
recipes/distributed-lock-manager/pom.xml | 3 +-
recipes/pom.xml | 2 +-
recipes/rabbitmq-consumer-group/pom.xml | 2 +-
recipes/rsync-replicated-file-system/pom.xml | 3 +-
recipes/service-discovery/pom.xml | 3 +-
.../servicediscovery/ServiceDiscoveryDemo.java | 19 +
recipes/task-execution/README.md | 154 ++++++++-
recipes/task-execution/pom.xml | 6 +-
.../apache/helix/taskexecution/TaskCluster.java | 2 -
.../helix/taskexecution/TaskExecutionDemo.java | 27 ++-
.../org/apache/helix/taskexecution/Worker.java | 9 +-
.../apt/releasenotes/release-0.6.1-incubating.apt | 110 ++++++
src/site/apt/releasing.apt | 16 +-
src/site/markdown/Concepts.md | 269 +++++++++++++++
src/site/markdown/Features.md | 179 ++++++++--
src/site/markdown/index.md | 2 +
src/site/markdown/recipes/task_dag_execution.md | 204 +++++++++++
src/site/site.xml | 3 +
26 files changed, 1036 insertions(+), 81 deletions(-)
----------------------------------------------------------------------