Merge branch 'master' into curator-rpc
Conflicts:
curator-x-discovery-server/src/site/confluence/index.confluence
curator-x-discovery/src/site/confluence/index.confluence
src/site/confluence/getting-started.confluence
src/site/confluence/index.confluence
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/cb9d8dd9
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/cb9d8dd9
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/cb9d8dd9
Branch: refs/heads/curator-rpc
Commit: cb9d8dd96e4c625f154f6f15d39801701c2cdab1
Parents: 09f030e de1d38c
Author: randgalt <randg...@apache.org>
Authored: Sat May 31 11:33:29 2014 -0500
Committer: randgalt <randg...@apache.org>
Committed: Sat May 31 11:33:29 2014 -0500
----------------------------------------------------------------------
.../src/site/confluence/index.confluence | 2 +-
.../src/site/confluence/index.confluence | 4 +--
.../distributed-delay-queue.confluence | 4 +--
.../confluence/distributed-id-queue.confluence | 2 +-
.../distributed-priority-queue.confluence | 4 +--
.../confluence/distributed-queue.confluence | 6 ++--
.../src/site/confluence/index.confluence | 38 ++++++++++----------
.../src/site/confluence/leader-latch.confluence | 2 +-
.../src/site/confluence/path-cache.confluence | 2 +-
.../site/confluence/shared-counter.confluence | 2 +-
.../confluence/shared-reentrant-lock.confluence | 2 +-
.../shared-reentrant-read-write-lock.confluence | 14 ++++----
.../site/confluence/shared-semaphore.confluence | 2 +-
.../simple-distributed-queue.confluence | 4 +--
.../src/site/confluence/index.confluence | 4 +--
.../src/site/confluence/index.confluence | 18 +++++-----
.../src/site/confluence/index.confluence | 2 +-
src/site/confluence/errors.confluence | 8 ++---
src/site/confluence/exhibitor.confluence | 12 +++----
src/site/confluence/getting-started.confluence | 4 +--
src/site/confluence/index.confluence | 24 ++++++-------
src/site/confluence/utilities.confluence | 8 ++---
22 files changed, 84 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/cb9d8dd9/curator-client/src/site/confluence/index.confluence
----------------------------------------------------------------------
