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/09/20 00:47:55 UTC
[1/3] git commit: make Config match yaml (#6059)
Updated Branches:
refs/heads/cassandra-2.0 f9f5af09d -> 742f6a3e1
refs/heads/trunk 388e1b236 -> 309324171
make Config match yaml (#6059)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/742f6a3e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/742f6a3e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/742f6a3e
Branch: refs/heads/cassandra-2.0
Commit: 742f6a3e12e4230a8d8d83b2ae726ec607671fba
Parents: f9f5af0
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 19 17:47:45 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 19 17:47:45 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/Config.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/742f6a3e/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java
index c6fd020..392e8c3 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -52,7 +52,7 @@ public class Config
public volatile Long request_timeout_in_ms = new Long(10000);
- public Long read_request_timeout_in_ms = new Long(10000);
+ public Long read_request_timeout_in_ms = new Long(5000);
public Long range_request_timeout_in_ms = new Long(10000);
[2/3] git commit: make Config match yaml (#6059)
Posted by jb...@apache.org.
make Config match yaml (#6059)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/742f6a3e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/742f6a3e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/742f6a3e
Branch: refs/heads/trunk
Commit: 742f6a3e12e4230a8d8d83b2ae726ec607671fba
Parents: f9f5af0
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 19 17:47:45 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 19 17:47:45 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/Config.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/742f6a3e/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java
index c6fd020..392e8c3 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -52,7 +52,7 @@ public class Config
public volatile Long request_timeout_in_ms = new Long(10000);
- public Long read_request_timeout_in_ms = new Long(10000);
+ public Long read_request_timeout_in_ms = new Long(5000);
public Long range_request_timeout_in_ms = new Long(10000);
[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/30932417
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30932417
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/30932417
Branch: refs/heads/trunk
Commit: 30932417122f5de01ff6beaf166f5e5b76aa5221
Parents: 388e1b2 742f6a3
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 19 17:47:49 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 19 17:47:49 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/Config.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------