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/ef37df4e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef37df4e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ef37df4e Branch: refs/heads/trunk Commit: ef37df4e42362457bffb15c305388e055f8f1f87 Parents: 0f5e780 2e09583 Author: Aleksey Yeschenko <[email protected]> Authored: Fri Dec 18 22:48:36 2015 +0000 Committer: Aleksey Yeschenko <[email protected]> Committed: Fri Dec 18 22:48:36 2015 +0000 ---------------------------------------------------------------------- bin/cqlsh.py | 4 +- pylib/cqlshlib/test/run_cqlsh.py | 108 +++++++++++++++------- pylib/cqlshlib/test/test_cqlsh_completion.py | 3 + pylib/cqlshlib/test/test_cqlsh_output.py | 22 +++-- pylib/cqlshlib/test/winpty.py | 50 ++++++++++ 5 files changed, 144 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef37df4e/bin/cqlsh.py ----------------------------------------------------------------------
