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 2013/10/09 15:32:10 UTC
[1/3] git commit: update Thrift server comment
Updated Branches:
refs/heads/cassandra-2.0 d0fae0999 -> 2f31bde61
refs/heads/trunk 9a1212328 -> 241aea057
update Thrift server comment
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f31bde6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f31bde6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f31bde6
Branch: refs/heads/cassandra-2.0
Commit: 2f31bde61e1c8cc7d02de694be70f0903185f9b2
Parents: d0fae09
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 9 08:31:37 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 9 08:31:57 2013 -0500
----------------------------------------------------------------------
conf/cassandra.yaml | 2 +-
src/java/org/apache/cassandra/thrift/TServerCustomFactory.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f31bde6/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 5a0dfb6..455421a 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -335,7 +335,7 @@ rpc_port: 9160
# enable or disable keepalive on rpc connections
rpc_keepalive: true
-# Cassandra provides three out-of-the-box options for the RPC Server:
+# Cassandra provides two out-of-the-box options for the RPC Server:
#
# sync -> One thread per thrift connection. For a very large number of clients, memory
# will be your limiting factor. On a 64 bit JVM, 180KB is the minimum stack size
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f31bde6/src/java/org/apache/cassandra/thrift/TServerCustomFactory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/TServerCustomFactory.java b/src/java/org/apache/cassandra/thrift/TServerCustomFactory.java
index 25800a0..3c21d3a 100644
--- a/src/java/org/apache/cassandra/thrift/TServerCustomFactory.java
+++ b/src/java/org/apache/cassandra/thrift/TServerCustomFactory.java
@@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory;
import org.apache.thrift.server.TServer;
/**
- * Helper implementation to create a thrift TServer based on one of the common types we support (sync, async, hsha),
+ * Helper implementation to create a thrift TServer based on one of the common types we support (sync, hsha),
* or a custom type by setting the fully qualified java class name in the rpc_server_type setting.
*/
public class TServerCustomFactory implements TServerFactory
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by jb...@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/241aea05
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/241aea05
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/241aea05
Branch: refs/heads/trunk
Commit: 241aea057650887aa645a9c208bc29bdac4d6457
Parents: 9a12123 2f31bde
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 9 08:32:05 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 9 08:32:05 2013 -0500
----------------------------------------------------------------------
conf/cassandra.yaml | 2 +-
src/java/org/apache/cassandra/thrift/TServerCustomFactory.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: update Thrift server comment
Posted by jb...@apache.org.
update Thrift server comment
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f31bde6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f31bde6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f31bde6
Branch: refs/heads/trunk
Commit: 2f31bde61e1c8cc7d02de694be70f0903185f9b2
Parents: d0fae09
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 9 08:31:37 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 9 08:31:57 2013 -0500
----------------------------------------------------------------------
conf/cassandra.yaml | 2 +-
src/java/org/apache/cassandra/thrift/TServerCustomFactory.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f31bde6/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 5a0dfb6..455421a 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -335,7 +335,7 @@ rpc_port: 9160
# enable or disable keepalive on rpc connections
rpc_keepalive: true
-# Cassandra provides three out-of-the-box options for the RPC Server:
+# Cassandra provides two out-of-the-box options for the RPC Server:
#
# sync -> One thread per thrift connection. For a very large number of clients, memory
# will be your limiting factor. On a 64 bit JVM, 180KB is the minimum stack size
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f31bde6/src/java/org/apache/cassandra/thrift/TServerCustomFactory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/TServerCustomFactory.java b/src/java/org/apache/cassandra/thrift/TServerCustomFactory.java
index 25800a0..3c21d3a 100644
--- a/src/java/org/apache/cassandra/thrift/TServerCustomFactory.java
+++ b/src/java/org/apache/cassandra/thrift/TServerCustomFactory.java
@@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory;
import org.apache.thrift.server.TServer;
/**
- * Helper implementation to create a thrift TServer based on one of the common types we support (sync, async, hsha),
+ * Helper implementation to create a thrift TServer based on one of the common types we support (sync, hsha),
* or a custom type by setting the fully qualified java class name in the rpc_server_type setting.
*/
public class TServerCustomFactory implements TServerFactory