Repository: cassandra Updated Branches: refs/heads/trunk fb9e75eb3 -> 33f5dc578
Revert "(cqlsh) show partial trace if incomplete after max_trace_wait" This reverts commit 626ac94cd53323cf84f92ab0d1f3e2a8c765f22b. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2548365a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2548365a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2548365a Branch: refs/heads/trunk Commit: 2548365a6ed44c93c31984e14281ba9e29aff3b8 Parents: 81e520c Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Nov 6 17:52:53 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Nov 6 17:52:53 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 2 -- bin/cqlsh | 3 --- 2 files changed, 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2548365a/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 14a7fbd..7771969 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -19,7 +19,6 @@ * (cqlsh) Distinguish negative and positive infinity in output (CASSANDRA-10523) * (cqlsh) allow custom time_format for COPY TO (CASSANDRA-8970) * Don't allow startup if the node's rack has changed (CASSANDRA-10242) - * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) * Fix sorting for queries with an IN condition on partition key columns (CASSANDRA-10363) @@ -29,7 +28,6 @@ * Mark nodes as dead even if they've already left (CASSANDRA-10205) * Update internal python driver used by cqlsh (CASSANDRA-10161, CASSANDRA-10507) - 2.1.10 * Bulk Loader API could not tolerate even node failure (CASSANDRA-10347) * Avoid misleading pushed notifications when multiple nodes http://git-wip-us.apache.org/repos/asf/cassandra/blob/2548365a/bin/cqlsh ---------------------------------------------------------------------- diff --git a/bin/cqlsh b/bin/cqlsh index b56a423..7291803 100755 --- a/bin/cqlsh +++ b/bin/cqlsh @@ -1071,9 +1071,6 @@ class Shell(cmd.Cmd): if self.tracing_enabled: if stmt.trace: print_trace(self, stmt.trace) - elif stmt.trace_id: - self.writeresult("This statement trace may be incomplete", color=RED) - self.show_session(stmt.trace_id) else: msg = "Statement trace did not complete within %d seconds" % (self.session.max_trace_wait) self.writeresult(msg, color=RED)
