Merge branch 'cassandra-2.1.0' into cassandra-2.1 Conflicts: bin/cqlsh
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f9fc846e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f9fc846e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f9fc846e Branch: refs/heads/cassandra-2.1 Commit: f9fc846e9b696b8bc4465bbcc08860e30a2bc08c Parents: b3f644f cfedc00 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Jul 23 13:14:28 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Jul 23 13:14:28 2014 -0500 ---------------------------------------------------------------------- bin/cqlsh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f9fc846e/bin/cqlsh ---------------------------------------------------------------------- diff --cc bin/cqlsh index c8ef874,fb6fb5f..4c1338a --- a/bin/cqlsh +++ b/bin/cqlsh @@@ -932,10 -920,10 +932,9 @@@ class Shell(cmd.Cmd) self.decoding_errors = [] self.writeresult("") - if rows : - self.print_static_result(rows) + self.print_static_result(rows, cfMetaData) + - self.writeresult("(%d rows)" % len(rows)) - self.writeresult("") + self.writeresult("(%d rows)" % len(rows or [])) - self.writeresult("") if self.decoding_errors: for err in self.decoding_errors[:2]: