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 2014/07/16 19:32:45 UTC
[2/2] 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/974f947b
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/974f947b
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/974f947b
Branch: refs/heads/master
Commit: 974f947b73f23bf71fdf558f3c884a16a61cfd53
Parents: b470aba a9e96ea
Author: zzhang <zz...@apache.org>
Authored: Wed Jul 16 10:32:31 2014 -0700
Committer: zzhang <zz...@apache.org>
Committed: Wed Jul 16 10:32:31 2014 -0700
----------------------------------------------------------------------
.../webapp/resources/WorkflowsResource.java | 19 +++++++
.../stages/BestPossibleStateCalcStage.java | 14 ++++--
.../manager/zk/ControllerManagerHelper.java | 2 +
.../apache/helix/manager/zk/ZKHelixManager.java | 12 ++---
.../helix/monitoring/ZKPathDataDumpTask.java | 2 +-
.../helix/participant/CustomCodeInvoker.java | 53 +++++++++-----------
.../TestDisableCustomCodeRunner.java | 23 ++++++---
7 files changed, 77 insertions(+), 48 deletions(-)
----------------------------------------------------------------------