Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d6b7326 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d6b7326 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d6b7326 Branch: refs/heads/cassandra-2.1 Commit: 8d6b732684ae24731e41250f62c1f0d262d06bb3 Parents: 6554bcc 948ae01 Author: Tyler Hobbs <ty...@datastax.com> Authored: Wed Jul 30 15:59:27 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Wed Jul 30 15:59:27 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ bin/cqlsh | 19 ++++++++++--- conf/cqlshrc.sample | 3 ++ pylib/cqlshlib/tracing.py | 29 ++++++++++++++------ .../cassandra/net/OutboundTcpConnection.java | 2 +- .../apache/cassandra/tracing/TraceState.java | 22 +++++++++++++++ .../org/apache/cassandra/tracing/Tracing.java | 7 +++-- 7 files changed, 68 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d6b7326/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d6b7326/bin/cqlsh ---------------------------------------------------------------------- diff --cc bin/cqlsh index 1b682f0,ba0c886..00e46b5 --- a/bin/cqlsh +++ b/bin/cqlsh @@@ -491,9 -492,9 +492,10 @@@ class Shell(cmd.Cmd) tracing_enabled=False, expand_enabled=False, display_time_format=DEFAULT_TIME_FORMAT, display_float_precision=DEFAULT_FLOAT_PRECISION, + max_trace_wait=DEFAULT_MAX_TRACE_WAIT, ssl=False, - single_statement=None): + single_statement=None, + client_timeout=10): cmd.Cmd.__init__(self, completekey=completekey) self.hostname = hostname self.port = port @@@ -1921,9 -1905,9 +1931,10 @@@ def main(options, hostname, port) keyspace=options.keyspace, display_time_format=options.time_format, display_float_precision=options.float_precision, + max_trace_wait=options.max_trace_wait, ssl=options.ssl, - single_statement=options.execute) + single_statement=options.execute, + client_timeout=options.client_timeout) except KeyboardInterrupt: sys.exit('Connection aborted.') except CQL_ERRORS, e:
