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 2013/09/24 03:54:40 UTC

[4/4] git commit: Merge branch 'CURATOR-52'

Merge branch 'CURATOR-52'


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

Branch: refs/heads/master
Commit: 6958370992624258f024d1bc62e7df1d7ddb929e
Parents: 38a2968 64a21a7
Author: randgalt <ra...@apache.org>
Authored: Mon Sep 23 18:55:54 2013 -0700
Committer: randgalt <ra...@apache.org>
Committed: Mon Sep 23 18:55:54 2013 -0700

----------------------------------------------------------------------
 .../org/apache/curator/ConnectionState.java     |   2 +-
 .../curator/CuratorConnectionLossException.java |  11 ++
 .../framework/imps/CreateBuilderImpl.java       |   4 +-
 .../framework/imps/CuratorFrameworkImpl.java    |  97 ++++++----
 .../framework/imps/DeleteBuilderImpl.java       |   2 +-
 .../framework/imps/ExistsBuilderImpl.java       |   2 +-
 .../framework/imps/GetACLBuilderImpl.java       |   2 +-
 .../framework/imps/GetChildrenBuilderImpl.java  |   2 +-
 .../framework/imps/GetDataBuilderImpl.java      |   2 +-
 .../framework/imps/OperationAndData.java        |  32 ++--
 .../framework/imps/SetACLBuilderImpl.java       |   2 +-
 .../framework/imps/SetDataBuilderImpl.java      |   2 +-
 .../curator/framework/imps/SyncBuilderImpl.java |   2 +-
 .../framework/imps/TestFrameworkEdges.java      | 178 +++++++++++--------
 14 files changed, 209 insertions(+), 131 deletions(-)
----------------------------------------------------------------------