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/2e095833 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e095833 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e095833 Branch: refs/heads/cassandra-3.0 Commit: 2e095833d9a45a6f1032b8beac2d94a47409a5e0 Parents: d877ba0 9dd2b5e Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Dec 18 22:48:12 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Dec 18 22:48:12 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/2e095833/bin/cqlsh.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e095833/pylib/cqlshlib/test/test_cqlsh_completion.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e095833/pylib/cqlshlib/test/test_cqlsh_output.py ----------------------------------------------------------------------
