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/b25cac40 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b25cac40 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b25cac40 Branch: refs/heads/trunk Commit: b25cac40e922e516a832f3323a55ab0e3870aad2 Parents: 76bd6bb 3391b99 Author: Mikhail Stepura <[email protected]> Authored: Wed May 28 15:14:58 2014 -0700 Committer: Mikhail Stepura <[email protected]> Committed: Wed May 28 15:14:58 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 5 +++ pylib/cqlshlib/test/test_cqlsh_output.py | 30 ++++++++++++++ pylib/cqlshlib/test/test_keyspace_init.cql | 40 ++++++++++++++++++ pylib/cqlshlib/usertypes.py | 55 ++++++++++++++++++++++++- 5 files changed, 130 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b25cac40/CHANGES.txt ----------------------------------------------------------------------
