Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/425bfaf2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/425bfaf2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/425bfaf2 Branch: refs/heads/cassandra-3.0 Commit: 425bfaf20b8ec8efb111c6a22882de9201efd1b1 Parents: 5c2912d f3cd3ed Author: Aleksey Yeschenko <alek...@apache.org> Authored: Thu Oct 1 21:21:54 2015 -0700 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Oct 1 21:21:54 2015 -0700 ---------------------------------------------------------------------- pylib/cqlshlib/test/basecase.py | 2 +- pylib/cqlshlib/test/cassconnect.py | 3 +- pylib/cqlshlib/test/run_cqlsh.py | 2 +- pylib/cqlshlib/test/test_cql_parsing.py | 254 +++++++++++----------- pylib/cqlshlib/test/test_cqlsh_completion.py | 18 +- pylib/cqlshlib/test/test_cqlsh_output.py | 13 +- pylib/cqlshlib/test/test_keyspace_init.cql | 2 +- 7 files changed, 149 insertions(+), 145 deletions(-) ----------------------------------------------------------------------
