Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/013ce885 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/013ce885 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/013ce885 Branch: refs/heads/cassandra-3.0 Commit: 013ce88512af839800597d1adc52689679a725a3 Parents: a5053fd 34b8d8f Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Oct 23 13:58:59 2015 -0400 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Oct 23 13:58:59 2015 -0400 ---------------------------------------------------------------------- pylib/cqlshlib/test/run_cqlsh.py | 2 +- pylib/cqlshlib/test/test_cqlsh_output.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/013ce885/pylib/cqlshlib/test/run_cqlsh.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/013ce885/pylib/cqlshlib/test/test_cqlsh_output.py ----------------------------------------------------------------------
