You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/09/19 17:21:26 UTC
[1/2] git commit: Fix comment
Updated Branches:
refs/heads/trunk 23156863d -> e1a910930
Fix comment
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c2a36e76
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2a36e76
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2a36e76
Branch: refs/heads/trunk
Commit: c2a36e7601f02765ebc8b661abbfc7264e765dab
Parents: 7453e6f
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Sep 19 18:20:40 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Sep 19 18:20:40 2013 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/thrift/ThriftServer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2a36e76/src/java/org/apache/cassandra/thrift/ThriftServer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/ThriftServer.java b/src/java/org/apache/cassandra/thrift/ThriftServer.java
index 3a0d545..dbd3824 100644
--- a/src/java/org/apache/cassandra/thrift/ThriftServer.java
+++ b/src/java/org/apache/cassandra/thrift/ThriftServer.java
@@ -81,7 +81,7 @@ public class ThriftServer implements CassandraDaemon.Server
}
/*
- * These methods are intended to be overriden to provide DSE specific implementations
+ * These methods are intended to be overridden to provide custom implementations.
*/
protected CassandraServer getCassandraServer()
{
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by al...@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/e1a91093
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1a91093
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1a91093
Branch: refs/heads/trunk
Commit: e1a9109309511d80c4358406990bcd80b17ae7e1
Parents: 2315686 c2a36e7
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Sep 19 18:21:11 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Sep 19 18:21:11 2013 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/thrift/ThriftServer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------