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/70d18cd3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70d18cd3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/70d18cd3 Branch: refs/heads/trunk Commit: 70d18cd3e6299c74812575c0d5abe68a8a6e0e58 Parents: 211d81c b2dd6a7 Author: Mikhail Stepura <[email protected]> Authored: Thu May 8 16:21:13 2014 -0700 Committer: Mikhail Stepura <[email protected]> Committed: Thu May 8 16:21:13 2014 -0700 ---------------------------------------------------------------------- pylib/cqlshlib/test/cassconnect.py | 4 +-- pylib/cqlshlib/test/test_cqlsh_completion.py | 2 +- pylib/cqlshlib/test/test_cqlsh_output.py | 43 +++++++++++------------ 3 files changed, 24 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
