Merge branch 'master' into CURATOR-3.0
authorrandgalt <randgalt@apache.org>
Sun, 17 Jan 2016 22:40:52 +0000 (17:40 -0500)
committerrandgalt <randgalt@apache.org>
Sun, 17 Jan 2016 22:40:52 +0000 (17:40 -0500)
commit9a03ea93937af047e8ad13c2e3e3559520abfb0a
treebd02d24de8c194f85156957d5721a47c8b249edb
parent24aa3c38ac4e78015f6a594c6d3604d3d9c30532
parent36a72d9c509a796d9e2bc112fab9356148a13f76
Merge branch 'master' into CURATOR-3.0

Conflicts:
curator-client/src/main/java/org/apache/curator/RetryLoop.java
curator-framework/src/main/java/org/apache/curator/framework/imps/FailedDeleteManager.java
curator-framework/src/main/java/org/apache/curator/framework/imps/OperationAndData.java
curator-framework/src/main/java/org/apache/curator/framework/state/ConnectionStateManager.java
curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreV2.java
curator-recipes/src/test/java/org/apache/curator/framework/client/TestResetConnectionWithBackgroundFailure.java
curator-test/src/main/java/org/apache/curator/test/TestingZooKeeperMain.java
23 files changed:
curator-client/src/main/java/org/apache/curator/ConnectionState.java
curator-client/src/main/java/org/apache/curator/CuratorZookeeperClient.java
curator-client/src/main/java/org/apache/curator/SessionFailRetryLoop.java
curator-client/src/main/java/org/apache/curator/connection/ClassicConnectionHandlingPolicy.java
curator-client/src/main/java/org/apache/curator/connection/StandardConnectionHandlingPolicy.java
curator-client/src/main/java/org/apache/curator/ensemble/exhibitor/ExhibitorEnsembleProvider.java
curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
curator-framework/src/main/java/org/apache/curator/framework/imps/DeleteBuilderImpl.java
curator-framework/src/main/java/org/apache/curator/framework/imps/FailedOperationManager.java
curator-framework/src/main/java/org/apache/curator/framework/imps/FindAndDeleteProtectedNodeInBackground.java
curator-framework/src/main/java/org/apache/curator/framework/imps/GetDataBuilderImpl.java
curator-framework/src/main/java/org/apache/curator/framework/imps/OperationAndData.java
curator-framework/src/main/java/org/apache/curator/framework/state/ConnectionStateManager.java
curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/NodeCache.java
curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java
curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java
curator-recipes/src/main/java/org/apache/curator/framework/recipes/leader/LeaderLatch.java
curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessSemaphoreV2.java
curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/LockInternals.java
curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentEphemeralNode.java
curator-recipes/src/main/java/org/apache/curator/framework/recipes/shared/SharedValue.java
curator-test/src/main/java/org/apache/curator/test/TestingZooKeeperMain.java