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 2013/08/24 02:54:17 UTC

[1/3] git commit: fix javadoc @link

Updated Branches:
  refs/heads/trunk 407980c76 -> 1bcaf5b80


fix javadoc @link


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

Branch: refs/heads/trunk
Commit: cc1072473bf4908ac24ee279111d8ffa6146f78b
Parents: 9a42e28
Author: Dave Brosius <db...@apache.org>
Authored: Fri Aug 23 20:50:29 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Fri Aug 23 20:50:29 2013 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/streaming/ConnectionHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc107247/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/ConnectionHandler.java b/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
index 092d6a3..57f76a7 100644
--- a/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
+++ b/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
@@ -91,7 +91,7 @@ public class ConnectionHandler
     /**
      * Set up outgoing message handler on receiving side.
      *
-     * @param socket socket to use for {@link OutgoingMessageHandler}.
+     * @param socket socket to use for {@link org.apache.cassandra.streaming.ConnectionHandler.OutgoingMessageHandler}.
      * @param version Streaming message version
      * @throws IOException
      */


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

Posted by db...@apache.org.
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 1bcaf5b800ad654cb6c26e846a2f29e32430cf24
Parents: 407980c 1a3cd2a
Author: Dave Brosius <db...@apache.org>
Authored: Fri Aug 23 20:53:39 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Fri Aug 23 20:53:39 2013 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/streaming/ConnectionHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[2/3] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0

Posted by db...@apache.org.
Merge branch 'cassandra-2.0.0' into cassandra-2.0


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

Branch: refs/heads/trunk
Commit: 1a3cd2a54e7f00ad8e0f145bf0b3b9a2daccab9b
Parents: f31c668 cc10724
Author: Dave Brosius <db...@apache.org>
Authored: Fri Aug 23 20:51:22 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Fri Aug 23 20:51:22 2013 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/streaming/ConnectionHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------