curator-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From randg...@apache.org
Subject [18/50] [abbrv] git commit: Merge branch 'master' into zk3.3.x
Date Mon, 10 Jun 2013 15:01:03 GMT
Merge branch 'master' into zk3.3.x

Conflicts:
	build.gradle
	curator-framework/src/main/java/com/netflix/curator/framework/CuratorFramework.java


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

Branch: refs/heads/zk3.3.x
Commit: c2117eaef4112d878c659c179470eb1c0714e221
Parents: 2745cda a718c3a
Author: Jordan Zimmerman <jordan@jordanzimmerman.com>
Authored: Mon Sep 3 17:32:04 2012 -0700
Committer: Jordan Zimmerman <jordan@jordanzimmerman.com>
Committed: Mon Sep 3 17:32:04 2012 -0700

----------------------------------------------------------------------
 CHANGES.txt                                     |   6 +
 build.gradle                                    |  18 +-
 .../com/netflix/curator/ConnectionState.java    |   5 +
 .../netflix/curator/CuratorZookeeperClient.java |  11 +
 .../curator/framework/CuratorFramework.java     |   2 +-
 .../framework/imps/CuratorEventImpl.java        |  17 +
 .../x/zkclientbridge/CuratorZKClientBridge.java | 222 +++++++++++
 .../zkclient/AbstractBaseZkClientTest.java      | 386 +++++++++++++++++++
 .../I0Itec/zkclient/AbstractConnectionTest.java |  56 +++
 .../org/I0Itec/zkclient/ContentWatcherTest.java | 160 ++++++++
 .../I0Itec/zkclient/DeferredGatewayStarter.java |  37 ++
 .../I0Itec/zkclient/DistributedQueueTest.java   | 131 +++++++
 .../I0Itec/zkclient/InMemoryConnectionTest.java |  25 ++
 .../org/I0Itec/zkclient/MemoryZkClientTest.java |  49 +++
 .../org/I0Itec/zkclient/ServerZkClientTest.java | 292 ++++++++++++++
 .../test/java/org/I0Itec/zkclient/TestUtil.java |  95 +++++
 .../zkclient/ZkClientSerializationTest.java     |  54 +++
 .../org/I0Itec/zkclient/ZkConnectionTest.java   |  36 ++
 .../I0Itec/zkclient/testutil/ZkPathUtil.java    |  80 ++++
 .../I0Itec/zkclient/testutil/ZkTestSystem.java  | 147 +++++++
 .../I0Itec/zkclient/util/ZkPathUtilTest.java    |  72 ++++
 settings.gradle                                 |   2 +-
 22 files changed, 1900 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/c2117eae/build.gradle
----------------------------------------------------------------------
diff --cc build.gradle
index 60f8422,e81f7dd..c5fd5af
--- a/build.gradle
+++ b/build.gradle
@@@ -1,5 -1,4 +1,5 @@@
 -ext.releaseVersion = '1.1.18'
 +// Establish version and status
- ext.releaseVersion = '1.0.18'
++ext.releaseVersion = '1.0.19'
  ext.githubProjectName = rootProject.name // Change if github project name is not the same
as the root project's name
  
  buildscript {

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/c2117eae/curator-client/src/main/java/com/netflix/curator/ConnectionState.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/c2117eae/curator-framework/src/main/java/com/netflix/curator/framework/CuratorFramework.java
----------------------------------------------------------------------
diff --cc curator-framework/src/main/java/com/netflix/curator/framework/CuratorFramework.java
index 706e8de,4c7d6d9..7d0969c
--- a/curator-framework/src/main/java/com/netflix/curator/framework/CuratorFramework.java
+++ b/curator-framework/src/main/java/com/netflix/curator/framework/CuratorFramework.java
@@@ -102,7 -103,14 +102,7 @@@ public interface CuratorFramework exten
       */
      public SetACLBuilder setACL();
  
-         /**
+     /**
 -     * Start a transaction builder
 -     *
 -     * @return builder object
 -     */
 -    public CuratorTransaction inTransaction();
 -
 -    /**
       * Perform a sync on the given path - syncs are always in the background
       *
       * @param path the path


Mime
View raw message