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/00d7e4c7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00d7e4c7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00d7e4c7 Branch: refs/heads/cassandra-2.1 Commit: 00d7e4c7fd8f746f862a21736e80053ba2c779f5 Parents: fe30c2c 2cbc280 Author: Tyler Hobbs <ty...@datastax.com> Authored: Wed Aug 6 14:48:56 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Wed Aug 6 14:48:56 2014 -0500 ---------------------------------------------------------------------- pylib/cqlshlib/test/test_cqlsh_output.py | 30 +++++++++++++++++++-------- 1 file changed, 21 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
