helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kisho...@apache.org
Subject [2/2] helix git commit: Merge branch 'helix-0.6.x' of https://github.com/jicongrui/helix into helix-0.6.x
Date Tue, 12 Jan 2016 06:29:58 GMT
Merge branch 'helix-0.6.x' of https://github.com/jicongrui/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/1dc2aae0
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/1dc2aae0
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/1dc2aae0

Branch: refs/heads/helix-0.6.x
Commit: 1dc2aae0dbbf37e68cf68e6f72b171057ecaff4a
Parents: 1798e79 308c2cc
Author: Kishore Gopalakrishna <g.kishore@gmail.com>
Authored: Mon Jan 11 22:28:17 2016 -0800
Committer: Kishore Gopalakrishna <g.kishore@gmail.com>
Committed: Mon Jan 11 22:28:17 2016 -0800

----------------------------------------------------------------------
 helix-core/helix-core-0.6.6-SNAPSHOT.ivy                     | 4 ++--
 helix-core/pom.xml                                           | 6 +++---
 .../java/org/apache/helix/manager/zk/ZKHelixManager.java     | 4 ++++
 .../java/org/apache/helix/manager/zk/ZkCallbackCache.java    | 3 +++
 .../src/main/java/org/apache/helix/manager/zk/ZkClient.java  | 1 -
 .../src/main/java/org/apache/helix/tools/ZKLogFormatter.java | 5 +----
 .../src/test/java/org/apache/helix/TestZkClientWrapper.java  | 4 ++++
 helix-core/src/test/java/org/apache/helix/ZkTestHelper.java  | 8 ++++++++
 .../src/test/java/org/apache/helix/ZkUnitTestBase.java       | 4 ++++
 .../java/org/apache/helix/manager/zk/TestZkFlapping.java     | 6 +++++-
 recipes/rabbitmq-consumer-group/pom.xml                      | 4 ++--
 recipes/rsync-replicated-file-system/pom.xml                 | 4 ++--
 12 files changed, 38 insertions(+), 15 deletions(-)
----------------------------------------------------------------------



Mime
View raw message