Merge branch 'cassandra-2.1' into trunk

2014-02-25 11:58:22 -08:00 · 2014-02-25 11:58:22 -08:00 · 1d598726f4
parent f48adab371 d4d4334ad0
commit 1d598726f4
1 changed files with 1 additions and 1 deletions
--- 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)