Merge branch 'helix-0.6.2-release' of https://git-wip-us.apache.org/repos/asf/incubator-helix into helix-0.6.2-release
Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/7db3d060 Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/7db3d060 Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/7db3d060 Branch: refs/heads/helix-0.6.2-release Commit: 7db3d060e99aa06e4241401485e37c65bb6e2298 Parents: 40bb97a 0c3796b Author: Kanak Biscuitwala <[email protected]> Authored: Fri Oct 18 15:26:36 2013 -0700 Committer: Kanak Biscuitwala <[email protected]> Committed: Fri Oct 18 15:26:36 2013 -0700 ---------------------------------------------------------------------- .../org/apache/helix/manager/zk/ZkClient.java | 41 ++- .../java/org/apache/helix/ZkTestHelper.java | 48 +++- .../apache/helix/manager/zk/TestZkFlapping.java | 272 +++++++++++++++++++ 3 files changed, 348 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
