curator-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From randg...@apache.org
Subject [27/29] git commit: Merge branch 'master' into CURATOR-105
Date Fri, 23 May 2014 15:07:28 GMT
Merge branch 'master' into CURATOR-105

Conflicts:
	curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java


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

Branch: refs/heads/CURATOR-105
Commit: 0bffdb020d78d8c6599a1eb9c2c702f9dd1192bd
Parents: a0fe6ae 0dcf833
Author: randgalt <randgalt@apache.org>
Authored: Fri May 23 09:46:02 2014 -0500
Committer: randgalt <randgalt@apache.org>
Committed: Fri May 23 09:46:02 2014 -0500

----------------------------------------------------------------------
 curator-client/pom.xml                          |   1 -
 .../org/apache/curator/utils/DebugUtils.java    |   1 +
 .../org/apache/curator/BaseClassForTests.java   |  42 ---
 .../java/org/apache/curator/BasicTests.java     |   1 +
 .../java/org/apache/curator/TestRetryLoop.java  |   1 +
 .../curator/TestSessionFailRetryLoop.java       |   3 +-
 .../TestExhibitorEnsembleProvider.java          |   9 +-
 curator-examples/pom.xml                        |   6 -
 curator-framework/pom.xml                       |   1 -
 .../framework/imps/CuratorFrameworkImpl.java    |  36 ++-
 .../framework/imps/BaseClassForTests.java       |  49 ----
 .../curator/framework/imps/TestCompression.java |   1 +
 .../framework/imps/TestFailedDeleteManager.java |   1 +
 .../curator/framework/imps/TestFramework.java   |   1 +
 .../framework/imps/TestFrameworkBackground.java |   1 +
 .../framework/imps/TestFrameworkEdges.java      |  26 +-
 .../curator/framework/imps/TestMultiClient.java |   1 +
 .../framework/imps/TestNamespaceFacade.java     |   1 +
 .../framework/imps/TestTempFramework.java       |   1 +
 .../framework/imps/TestTransactions.java        |   1 +
 .../framework/imps/TestWatcherIdentity.java     |   1 +
 curator-recipes/pom.xml                         |   1 -
 .../recipes/cache/PathChildrenCache.java        |  32 +--
 .../framework/recipes/leader/LeaderLatch.java   |   3 +-
 .../framework/recipes/locks/LockInternals.java  |  13 +-
 .../framework/client/TestBackgroundStates.java  |   9 +-
 ...estResetConnectionWithBackgroundFailure.java |  16 +-
 .../framework/recipes/BaseClassForTests.java    |  42 ---
 .../recipes/atomic/TestCachedAtomicCounter.java |   2 +-
 .../atomic/TestDistributedAtomicLong.java       |   2 +-
 .../barriers/TestDistributedBarrier.java        |   2 +-
 .../barriers/TestDistributedDoubleBarrier.java  |   2 +-
 .../framework/recipes/cache/TestNodeCache.java  |   2 +-
 .../recipes/cache/TestPathChildrenCache.java    |  76 +++---
 .../recipes/leader/TestLeaderLatch.java         |   2 +-
 .../recipes/leader/TestLeaderSelector.java      |   2 +-
 .../recipes/leader/TestLeaderSelectorEdges.java |   2 +-
 .../leader/TestLeaderSelectorParticipants.java  |   2 +-
 .../leader/TestLeaderSelectorWithExecutor.java  |   2 +-
 .../recipes/locks/TestChildReaper.java          |   2 +-
 .../locks/TestInterProcessMutexBase.java        |   2 +-
 .../locks/TestInterProcessReadWriteLock.java    |   2 +-
 .../locks/TestInterProcessSemaphore.java        |  36 ++-
 .../locks/TestInterProcessSemaphoreCluster.java |   4 +-
 .../framework/recipes/locks/TestLockACLs.java   |   2 +-
 .../locks/TestLockCleanlinessWithFaults.java    |   6 +-
 .../framework/recipes/locks/TestReaper.java     |   6 +-
 .../nodes/TestPersistentEphemeralNode.java      |  39 ++-
 .../TestPersistentEphemeralNodeListener.java    |   9 +-
 .../queue/TestBoundedDistributedQueue.java      |   8 +-
 .../queue/TestDistributedDelayQueue.java        |   2 +-
 .../recipes/queue/TestDistributedIdQueue.java   |   2 +-
 .../queue/TestDistributedPriorityQueue.java     |   2 +-
 .../recipes/queue/TestDistributedQueue.java     |   2 +-
 .../recipes/queue/TestQueueSharder.java         |   8 +-
 .../queue/TestSimpleDistributedQueue.java       |   2 +-
 .../recipes/shared/TestSharedCount.java         |   2 +-
 curator-test/pom.xml                            |   9 +-
 .../apache/curator/test/BaseClassForTests.java  |  98 +++++++
 .../curator/test/TestingZooKeeperMain.java      |  51 ++--
 .../curator/test/TestingZooKeeperServer.java    |   2 +-
 curator-x-discovery-server/pom.xml              |  24 --
 .../contexts/GenericDiscoveryContext.java       |  20 +-
 .../server/contexts/MapDiscoveryContext.java    |   4 +-
 .../server/jetty_jersey/TestMapsWithJersey.java |   2 +-
 .../TestObjectPayloadWithJersey.java            |  34 +--
 .../jetty_jersey/TestStringsWithJersey.java     |  18 +-
 .../jetty_resteasy/TestStringsWithRestEasy.java |   2 +-
 curator-x-discovery/pom.xml                     |   2 -
 .../curator/x/discovery/TestServiceCache.java   |  11 +-
 .../x/discovery/TestServiceDiscovery.java       |  13 +-
 .../apache/curator/x/discovery/TestUriSpec.java |   2 +-
 pom.xml                                         | 273 +++++++++++++++----
 73 files changed, 631 insertions(+), 467 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/0bffdb02/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/curator/blob/0bffdb02/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java
----------------------------------------------------------------------


Mime
View raw message