You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/08/02 07:46:47 UTC

[1/3] git commit: make StreamSessionConnector a static inner class

Repository: cassandra
Updated Branches:
  refs/heads/trunk 35047a8f6 -> a4e8e1656


make StreamSessionConnector a static inner class


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/85b74382
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85b74382
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85b74382

Branch: refs/heads/trunk
Commit: 85b74382782767b82cf9b5393770cdf93dd0645d
Parents: 41a85af
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sat Aug 2 01:17:50 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sat Aug 2 01:17:50 2014 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/streaming/StreamCoordinator.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/85b74382/src/java/org/apache/cassandra/streaming/StreamCoordinator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamCoordinator.java b/src/java/org/apache/cassandra/streaming/StreamCoordinator.java
index 4a6b193..14dad29 100644
--- a/src/java/org/apache/cassandra/streaming/StreamCoordinator.java
+++ b/src/java/org/apache/cassandra/streaming/StreamCoordinator.java
@@ -183,7 +183,7 @@ public class StreamCoordinator
         return data;
     }
 
-    private class StreamSessionConnector implements Runnable
+    private static class StreamSessionConnector implements Runnable
     {
         private final StreamSession session;
         public StreamSessionConnector(StreamSession session)
@@ -191,6 +191,7 @@ public class StreamCoordinator
             this.session = session;
         }
 
+        @Override
         public void run()
         {
             session.start();


[2/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Posted by db...@apache.org.
Merge branch 'cassandra-2.1.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/63d1d296
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63d1d296
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63d1d296

Branch: refs/heads/trunk
Commit: 63d1d2968c59100f5a458b64ef884d4b675557f6
Parents: d33e29a 85b7438
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sat Aug 2 01:45:18 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sat Aug 2 01:45:18 2014 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/streaming/StreamCoordinator.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------



[3/3] git commit: Merge branch 'cassandra-2.1' into trunk

Posted by db...@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/a4e8e165
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a4e8e165
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a4e8e165

Branch: refs/heads/trunk
Commit: a4e8e1656536fdf8121b3affa0af3195d98db4f5
Parents: 35047a8 63d1d29
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sat Aug 2 01:45:56 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sat Aug 2 01:45:56 2014 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/streaming/StreamCoordinator.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------