You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2015/07/02 00:23:16 UTC

[1/2] cassandra git commit: cqlsh: fix DESCRIBE KEYSPACES

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 c80964a79 -> 92e2e4e46


cqlsh: fix DESCRIBE KEYSPACES

Patch by Mike Adamson; reviewed by Tyler Hobbs for CASSANDRA-9693


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5f03a98
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5f03a98
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5f03a98

Branch: refs/heads/cassandra-2.2
Commit: c5f03a988396bb5969a0bb3dd835218c0658e681
Parents: 3491ab5
Author: Mike Adamson <ma...@datastax.com>
Authored: Wed Jul 1 17:12:11 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Wed Jul 1 17:12:11 2015 -0500

----------------------------------------------------------------------
 bin/cqlsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5f03a98/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 9f872f8..bf0f8fd 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -1423,7 +1423,7 @@ class Shell(cmd.Cmd):
         what = parsed.matched[1][1].lower()
         if what == 'keyspaces':
             self.describe_keyspaces()
-        if what == 'keyspace':
+        elif what == 'keyspace':
             ksname = self.cql_unprotect_name(parsed.get_binding('ksname', ''))
             if not ksname:
                 ksname = self.current_keyspace


[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

Posted by ty...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/92e2e4e4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92e2e4e4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92e2e4e4

Branch: refs/heads/cassandra-2.2
Commit: 92e2e4e46d93003e025add6c2c7ab4840bcfdabf
Parents: c80964a c5f03a9
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Wed Jul 1 17:23:05 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Wed Jul 1 17:23:05 2015 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------