Merge branch 'CURATOR-96'
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/6784f807 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/6784f807 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/6784f807 Branch: refs/heads/master Commit: 6784f80749d0995ec10875fd4973a52d8b962520 Parents: 3c468b2 449eeff Author: randgalt <randg...@apache.org> Authored: Wed May 14 10:11:31 2014 -0500 Committer: randgalt <randg...@apache.org> Committed: Wed May 14 10:11:31 2014 -0500 ---------------------------------------------------------------------- curator-client/pom.xml | 1 - .../curator/TestSessionFailRetryLoop.java | 2 +- curator-examples/pom.xml | 6 - curator-framework/pom.xml | 1 - curator-recipes/pom.xml | 1 - .../framework/client/TestBackgroundStates.java | 7 +- ...estResetConnectionWithBackgroundFailure.java | 14 +- .../locks/TestInterProcessSemaphoreCluster.java | 4 +- .../locks/TestLockCleanlinessWithFaults.java | 4 +- .../framework/recipes/locks/TestReaper.java | 4 +- .../TestPersistentEphemeralNodeListener.java | 7 +- .../queue/TestBoundedDistributedQueue.java | 6 +- .../recipes/queue/TestQueueSharder.java | 6 +- curator-test/pom.xml | 3 - 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 - .../apache/curator/x/discovery/TestUriSpec.java | 2 +- pom.xml | 273 +++++++++++++++---- 24 files changed, 288 insertions(+), 159 deletions(-) ----------------------------------------------------------------------