Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2216d392 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2216d392 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2216d392 Branch: refs/heads/trunk Commit: 2216d3924252c2b7ac1a3091009114043a38fcac Parents: c3be5ab 425bfaf Author: Aleksey Yeschenko <[email protected]> Authored: Thu Oct 1 21:22:16 2015 -0700 Committer: Aleksey Yeschenko <[email protected]> Committed: Thu Oct 1 21:22:16 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(-) ----------------------------------------------------------------------
