You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mi...@apache.org on 2014/02/19 23:45:01 UTC
[1/2] git commit: Return an empty meta object instead of None. Patch
by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-6741
Repository: cassandra
Updated Branches:
refs/heads/trunk 916e57b4a -> e4c99d67e
Return an empty meta object instead of None.
Patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-6741
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ce2bbcbf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce2bbcbf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ce2bbcbf
Branch: refs/heads/trunk
Commit: ce2bbcbf02fc19ade198c8444289cd7a805f8dc2
Parents: ddaddf6
Author: Mikhail Stepura <mi...@apache.org>
Authored: Wed Feb 19 14:32:04 2014 -0800
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Wed Feb 19 14:43:14 2014 -0800
----------------------------------------------------------------------
bin/cqlsh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce2bbcbf/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index b0128e7..ef08dab 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -722,7 +722,7 @@ class Shell(cmd.Cmd):
self.cursor.execute(ut_q, consistency_level='ONE')
data = self.fetchdict_all()
if not data:
- return None
+ return cql3handling.UserTypesMeta({})
return cql3handling.UserTypesMeta.from_layout(data)
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by mi...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e4c99d67
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4c99d67
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e4c99d67
Branch: refs/heads/trunk
Commit: e4c99d67e32c5a507259bdcb3eb2dd79be739c3b
Parents: 916e57b ce2bbcb
Author: Mikhail Stepura <mi...@apache.org>
Authored: Wed Feb 19 14:44:34 2014 -0800
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Wed Feb 19 14:44:34 2014 -0800
----------------------------------------------------------------------
bin/cqlsh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------