You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@curator.apache.org by ra...@apache.org on 2017/05/09 21:17:03 UTC

[4/6] curator git commit: Merge branch 'master' into CURATOR-397

Merge branch 'master' into CURATOR-397


Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/555e1d46
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/555e1d46
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/555e1d46

Branch: refs/heads/CURATOR-397
Commit: 555e1d4684e233e1caa910be67a4ff892253d9c7
Parents: e4a7e09 32a7755
Author: randgalt <ra...@apache.org>
Authored: Mon May 8 18:36:48 2017 +0200
Committer: randgalt <ra...@apache.org>
Committed: Mon May 8 18:36:48 2017 +0200

----------------------------------------------------------------------
 .../framework/imps/TestFrameworkEdges.java      | 26 ++++++++++++++------
 .../curator/test/TestingQuorumPeerMain.java     |  3 +--
 .../curator/test/TestingZooKeeperMain.java      |  7 ------
 .../curator/test/TestingZooKeeperServer.java    | 15 ++++++++---
 .../apache/curator/test/ZooKeeperMainFace.java  |  3 ---
 5 files changed, 31 insertions(+), 23 deletions(-)
----------------------------------------------------------------------