curator-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From randg...@apache.org
Subject [49/50] curator git commit: Merge branch 'master' into CURATOR-3.0
Date Wed, 06 May 2015 04:14:24 GMT
Merge branch 'master' into CURATOR-3.0

Conflicts:
	curator-client/pom.xml
	curator-examples/pom.xml
	curator-framework/pom.xml
	curator-recipes/pom.xml
	curator-test/pom.xml
	curator-x-discovery-server/pom.xml
	curator-x-discovery/pom.xml
	curator-x-rpc/pom.xml
	pom.xml


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

Branch: refs/heads/CURATOR-3.0
Commit: 9088572c7d26acdee54b8fba06ee4c9c66310831
Parents: d4883a8 d9362d1
Author: randgalt <randgalt@apache.org>
Authored: Tue May 5 23:11:37 2015 -0500
Committer: randgalt <randgalt@apache.org>
Committed: Tue May 5 23:11:37 2015 -0500

----------------------------------------------------------------------
 .../org/apache/curator/utils/ThreadUtils.java   |   5 +
 .../java/org/apache/curator/utils/ZKPaths.java  | 103 ++++-
 .../org/apache/curator/utils/TestZKPaths.java   |  11 +
 .../main/java/discovery/InstanceDetails.java    |   2 +-
 .../org/apache/curator/framework/AuthInfo.java  |  51 +++
 .../framework/CuratorFrameworkFactory.java      | 127 ++++--
 .../framework/imps/CreateBuilderImpl.java       |  16 +-
 .../framework/imps/CuratorFrameworkImpl.java    | 116 +++---
 .../imps/CuratorTempFrameworkImpl.java          |  10 +-
 .../framework/imps/DeleteBuilderImpl.java       | 103 ++---
 .../curator/framework/imps/NamespaceFacade.java |   8 +-
 .../curator/framework/imps/NamespaceImpl.java   |   6 +-
 .../curator/framework/imps/TestFramework.java   | 349 ++++++++++------
 .../framework/imps/TestFrameworkBackground.java |   4 +-
 .../framework/imps/TestFrameworkEdges.java      |  85 +++-
 .../framework/recipes/cache/TreeCache.java      |   2 +-
 .../framework/recipes/locks/ChildReaper.java    | 157 +++++++-
 .../locks/InterProcessReadWriteLock.java        |   3 +-
 .../recipes/locks/InterProcessSemaphoreV2.java  |   7 +
 .../curator/framework/recipes/locks/Reaper.java |  65 ++-
 .../recipes/nodes/PersistentEphemeralNode.java  |  54 ++-
 .../framework/client/TestBackgroundStates.java  |  14 +-
 ...estResetConnectionWithBackgroundFailure.java |   8 +-
 .../framework/recipes/cache/TestTreeCache.java  |  43 ++
 .../recipes/leader/TestLeaderSelector.java      |  67 ++++
 .../recipes/locks/TestChildReaper.java          | 248 +++++++++++-
 .../locks/TestInterProcessSemaphore.java        |  40 ++
 .../framework/recipes/locks/TestReaper.java     |  90 ++++-
 .../nodes/TestPersistentEphemeralNode.java      | 125 +++++-
 .../TestPersistentEphemeralNodeListener.java    |   9 +-
 .../contexts/GenericDiscoveryContext.java       |   8 +-
 .../contexts/IntegerDiscoveryContext.java       |   4 +-
 .../server/contexts/StringDiscoveryContext.java |   4 +-
 .../entity/JsonServiceInstanceMarshaller.java   |   6 +-
 .../entity/JsonServiceInstancesMarshaller.java  |   8 +-
 .../entity/JsonServiceNamesMarshaller.java      |   8 +-
 .../discovery/server/rest/DiscoveryContext.java |   4 +-
 .../server/jetty_jersey/ServiceDetails.java     |   4 +-
 curator-x-discovery/pom.xml                     |  14 +-
 .../x/discovery/ServiceDiscoveryBuilder.java    |  45 ++-
 .../curator/x/discovery/ServiceInstance.java    |   6 +-
 .../details/JsonInstanceSerializer.java         |   4 +-
 .../discovery/details/ServiceDiscoveryImpl.java | 245 ++++++++----
 .../x/discovery/TestServiceDiscovery.java       | 266 -------------
 .../discovery/details/TestServiceDiscovery.java | 394 +++++++++++++++++++
 .../discovery/details/TestWatchedInstances.java |  94 +++++
 curator-x-rpc/pom.xml                           |  19 +
 .../java/org/apache/curator/x/rpc/RpcTests.java |   6 +-
 pom.xml                                         |  85 +---
 49 files changed, 2310 insertions(+), 842 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/9088572c/curator-x-discovery/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/curator/blob/9088572c/curator-x-rpc/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/curator/blob/9088572c/pom.xml
----------------------------------------------------------------------


Mime
View raw message