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/06/12 23:07:03 UTC

[2/2] git commit: Merge branch 'helix-0.6.x' of https://git-wip-us.apache.org/repos/asf/helix into helix-0.6.x

Merge branch 'helix-0.6.x' of https://git-wip-us.apache.org/repos/asf/helix into helix-0.6.x


Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/923e714e
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/923e714e
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/923e714e

Branch: refs/heads/helix-0.6.x
Commit: 923e714ec20de3089267b3b75b8590ef61a842cf
Parents: 2d9f6c2 21f09ef
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Thu Jun 12 14:06:52 2014 -0700
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Thu Jun 12 14:06:52 2014 -0700

----------------------------------------------------------------------
 .../messaging/handling/HelixTaskExecutor.java   | 121 +++++++++---
 .../java/org/apache/helix/model/Message.java    |  10 -
 .../helix/integration/TestZkSessionExpiry.java  | 188 +++++++++++++++++++
 3 files changed, 285 insertions(+), 34 deletions(-)
----------------------------------------------------------------------