You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/05/30 23:49:12 UTC
[1/6] git commit: make Shuffle client static
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 886d9fce4 -> e68ac31f3
refs/heads/cassandra-2.1 90477c310 -> d93572d5c
refs/heads/trunk d579be520 -> 826271118
make Shuffle client static
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e68ac31f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e68ac31f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e68ac31f
Branch: refs/heads/cassandra-2.0
Commit: e68ac31f3fc5a1a44bdb36a4124bf921a65f2be4
Parents: 886d9fc
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri May 30 15:21:27 2014 +0100
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri May 30 22:48:20 2014 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/Shuffle.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e68ac31f/src/java/org/apache/cassandra/tools/Shuffle.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/Shuffle.java b/src/java/org/apache/cassandra/tools/Shuffle.java
index c1ebafe..7cd9d31 100644
--- a/src/java/org/apache/cassandra/tools/Shuffle.java
+++ b/src/java/org/apache/cassandra/tools/Shuffle.java
@@ -667,7 +667,7 @@ public class Shuffle extends AbstractJmxClient
}
/** A self-contained Cassandra.Client; Closeable. */
- class CassandraClient implements Closeable
+ private static class CassandraClient implements Closeable
{
TTransport transport;
Cassandra.Client client;
[4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d93572d5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d93572d5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d93572d5
Branch: refs/heads/trunk
Commit: d93572d5c319501ac3f824e52e5758b626577e5c
Parents: 90477c3 e68ac31
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri May 30 22:48:51 2014 +0100
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri May 30 22:48:51 2014 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/Shuffle.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d93572d5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d93572d5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d93572d5
Branch: refs/heads/cassandra-2.1
Commit: d93572d5c319501ac3f824e52e5758b626577e5c
Parents: 90477c3 e68ac31
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri May 30 22:48:51 2014 +0100
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri May 30 22:48:51 2014 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/Shuffle.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82627111
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82627111
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82627111
Branch: refs/heads/trunk
Commit: 826271118969f036f4fdf225a7f7fbb37012c901
Parents: d579be5 d93572d
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri May 30 22:49:04 2014 +0100
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri May 30 22:49:04 2014 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/Shuffle.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/6] git commit: make Shuffle client static
Posted by jb...@apache.org.
make Shuffle client static
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e68ac31f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e68ac31f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e68ac31f
Branch: refs/heads/cassandra-2.1
Commit: e68ac31f3fc5a1a44bdb36a4124bf921a65f2be4
Parents: 886d9fc
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri May 30 15:21:27 2014 +0100
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri May 30 22:48:20 2014 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/Shuffle.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e68ac31f/src/java/org/apache/cassandra/tools/Shuffle.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/Shuffle.java b/src/java/org/apache/cassandra/tools/Shuffle.java
index c1ebafe..7cd9d31 100644
--- a/src/java/org/apache/cassandra/tools/Shuffle.java
+++ b/src/java/org/apache/cassandra/tools/Shuffle.java
@@ -667,7 +667,7 @@ public class Shuffle extends AbstractJmxClient
}
/** A self-contained Cassandra.Client; Closeable. */
- class CassandraClient implements Closeable
+ private static class CassandraClient implements Closeable
{
TTransport transport;
Cassandra.Client client;
[3/6] git commit: make Shuffle client static
Posted by jb...@apache.org.
make Shuffle client static
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e68ac31f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e68ac31f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e68ac31f
Branch: refs/heads/trunk
Commit: e68ac31f3fc5a1a44bdb36a4124bf921a65f2be4
Parents: 886d9fc
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri May 30 15:21:27 2014 +0100
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri May 30 22:48:20 2014 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/Shuffle.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e68ac31f/src/java/org/apache/cassandra/tools/Shuffle.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/Shuffle.java b/src/java/org/apache/cassandra/tools/Shuffle.java
index c1ebafe..7cd9d31 100644
--- a/src/java/org/apache/cassandra/tools/Shuffle.java
+++ b/src/java/org/apache/cassandra/tools/Shuffle.java
@@ -667,7 +667,7 @@ public class Shuffle extends AbstractJmxClient
}
/** A self-contained Cassandra.Client; Closeable. */
- class CassandraClient implements Closeable
+ private static class CassandraClient implements Closeable
{
TTransport transport;
Cassandra.Client client;