Merge branch 'master' into CURATOR-408
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/d4547b4f Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/d4547b4f Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/d4547b4f Branch: refs/heads/master Commit: d4547b4f49bd4599ad89c26998b3391c270587b3 Parents: 1fa4bf6 5cb22be Author: randgalt <[email protected]> Authored: Thu Jun 28 01:03:22 2018 -0500 Committer: randgalt <[email protected]> Committed: Thu Jun 28 01:03:22 2018 -0500 ---------------------------------------------------------------------- .../framework/imps/CuratorFrameworkImpl.java | 44 +++++++++----------- curator-x-async/pom.xml | 12 ------ .../discovery/details/TestServiceCacheRace.java | 18 ++++++++ src/site/site.xml | 2 +- 4 files changed, 38 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/d4547b4f/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java ----------------------------------------------------------------------
