Merge branch 'CURATOR-3.0' 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/e40ed181 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/e40ed181 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/e40ed181 Branch: refs/heads/CURATOR-397 Commit: e40ed181655a83e705e6d74704d2fa2d1f93a7bc Parents: 3d59310 35f5d27 Author: randgalt <randg...@apache.org> Authored: Mon May 1 14:55:59 2017 -0500 Committer: randgalt <randg...@apache.org> Committed: Mon May 1 14:55:59 2017 -0500 ---------------------------------------------------------------------- .../org/apache/curator/utils/ThreadUtils.java | 4 +- .../curator/framework/api/CreateBuilder.java | 17 +- .../curator/framework/api/CreateBuilder2.java | 34 +++ .../framework/imps/CreateBuilderImpl.java | 134 +++++------- .../curator/framework/imps/TestTtlNodes.java | 88 ++++++++ .../framework/recipes/nodes/PersistentNode.java | 50 +++-- .../recipes/nodes/PersistentTtlNode.java | 209 +++++++++++++++++++ .../src/site/confluence/index.confluence | 3 +- .../persistent-ephemeral-node.confluence | 39 ---- .../site/confluence/persistent-node.confluence | 39 ++++ .../confluence/persistent-ttl-node.confluence | 41 ++++ .../recipes/nodes/TestPersistentTtlNode.java | 153 ++++++++++++++ .../curator/x/async/api/AsyncCreateBuilder.java | 29 +++ .../x/async/details/AsyncCreateBuilderImpl.java | 22 +- pom.xml | 2 +- 15 files changed, 727 insertions(+), 137 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/e40ed181/pom.xml ----------------------------------------------------------------------
