You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/02/15 02:07:25 UTC
[1/2] git commit: cqlsh: fix BATCH CAS result printing (for once
#6561 is committed)
Repository: cassandra
Updated Branches:
refs/heads/trunk b0954a0c1 -> 41433073f
cqlsh: fix BATCH CAS result printing (for once #6561 is committed)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bbc56eb6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bbc56eb6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bbc56eb6
Branch: refs/heads/trunk
Commit: bbc56eb60d9c9629deb231131d65cf55ee15c2db
Parents: 15fd82c
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Feb 15 04:03:10 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Feb 15 04:03:10 2014 +0300
----------------------------------------------------------------------
bin/cqlsh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbc56eb6/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 0add46c..1b97783 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -921,7 +921,7 @@ class Shell(cmd.Cmd):
if statement[:6].lower() == 'select' or statement.lower().startswith("list"):
self.print_result(self.cursor, with_default_limit)
- elif self.cursor.rowcount == 1:
+ elif self.cursor.rowcount > 0:
# CAS INSERT/UPDATE
self.writeresult("")
self.print_static_result(self.cursor)
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by al...@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/41433073
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/41433073
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/41433073
Branch: refs/heads/trunk
Commit: 41433073f696738f17696a0cf395c44c007847f5
Parents: b0954a0 bbc56eb
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Feb 15 04:07:12 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Feb 15 04:07:12 2014 +0300
----------------------------------------------------------------------
bin/cqlsh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/41433073/bin/cqlsh
----------------------------------------------------------------------