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/25 20:58:33 UTC
[1/2] git commit: Return a tuple instead of list. Patch by Mikhail
Stepura for CASSANDRA-6770.
Repository: cassandra
Updated Branches:
refs/heads/trunk f48adab37 -> 1d598726f
Return a tuple instead of list.
Patch by Mikhail Stepura for CASSANDRA-6770.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d4d4334a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4d4334a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4d4334a
Branch: refs/heads/trunk
Commit: d4d4334ad01cd805fce9e5cdcea4ed1a1abb9c69
Parents: bdd24cc
Author: Mikhail Stepura <mi...@apache.org>
Authored: Tue Feb 25 11:49:00 2014 -0800
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Tue Feb 25 11:49:00 2014 -0800
----------------------------------------------------------------------
pylib/cqlshlib/usertypes.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4d4334a/pylib/cqlshlib/usertypes.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/usertypes.py b/pylib/cqlshlib/usertypes.py
index 078016b..4438913 100644
--- a/pylib/cqlshlib/usertypes.py
+++ b/pylib/cqlshlib/usertypes.py
@@ -57,7 +57,7 @@ class UserType(CompositeType):
result.append((str(col_name), col_type.from_binary(item)))
p += 1
- return result
+ return tuple(result)
[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/1d598726
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1d598726
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1d598726
Branch: refs/heads/trunk
Commit: 1d598726f49e69786b994c94c71b7065b90455b3
Parents: f48adab d4d4334
Author: Mikhail Stepura <mi...@apache.org>
Authored: Tue Feb 25 11:58:22 2014 -0800
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Tue Feb 25 11:58:22 2014 -0800
----------------------------------------------------------------------
pylib/cqlshlib/usertypes.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------