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/87f16ca9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87f16ca9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87f16ca9 Branch: refs/heads/trunk Commit: 87f16ca9ac52d8042563ce5198b776f355236617 Parents: 71d9dba 1d28a4a Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Oct 23 13:59:23 2015 -0400 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Oct 23 13:59:23 2015 -0400 ---------------------------------------------------------------------- pylib/cqlshlib/test/run_cqlsh.py | 2 +- pylib/cqlshlib/test/test_cqlsh_output.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
