You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2016/01/13 14:50:13 UTC
[4/4] cassandra git commit: Merge branch cassandra-2.2 into
cassandra-3.0
Merge branch cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95012dab
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95012dab
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95012dab
Branch: refs/heads/cassandra-3.0
Commit: 95012dab5b9a6f70a419fb0a6f34bf665de1a285
Parents: 9803d66 c7f0032
Author: Benjamin Lerer <b....@gmail.com>
Authored: Wed Jan 13 14:49:26 2016 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Wed Jan 13 14:49:41 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh.py | 22 +++++++++++++---------
2 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/95012dab/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/95012dab/bin/cqlsh.py
----------------------------------------------------------------------
diff --cc bin/cqlsh.py
index 60ac1a2,c03a3c2..987aa59
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -163,9 -162,10 +163,10 @@@ from cqlshlib.util import get_file_enco
DEFAULT_HOST = '127.0.0.1'
DEFAULT_PORT = 9042
-DEFAULT_CQLVER = '3.3.1'
+DEFAULT_CQLVER = '3.4.0'
DEFAULT_PROTOCOL_VERSION = 4
DEFAULT_CONNECT_TIMEOUT_SECONDS = 5
+ DEFAULT_REQUEST_TIMEOUT_SECONDS = 10
DEFAULT_FLOAT_PRECISION = 5
DEFAULT_MAX_TRACE_WAIT = 10