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/0171cd6f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0171cd6f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0171cd6f Branch: refs/heads/trunk Commit: 0171cd6ff08554eab7916a9464fd8cd224edb69a Parents: c9240e7 39c295d Author: Mikhail Stepura <mish...@apache.org> Authored: Mon May 26 09:42:12 2014 -0700 Committer: Mikhail Stepura <mish...@apache.org> Committed: Mon May 26 09:42:12 2014 -0700 ---------------------------------------------------------------------- pylib/cqlshlib/formatting.py | 4 +- pylib/cqlshlib/test/cassconnect.py | 10 ++-- pylib/cqlshlib/test/test_cqlsh_completion.py | 2 +- pylib/cqlshlib/test/test_cqlsh_output.py | 58 ++++++++++++----------- pylib/cqlshlib/test/test_keyspace_init.cql | 10 +++- pylib/cqlshlib/usertypes.py | 9 ++-- 6 files changed, 55 insertions(+), 38 deletions(-) ----------------------------------------------------------------------
