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/1d28a4ac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1d28a4ac Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1d28a4ac Branch: refs/heads/cassandra-3.0 Commit: 1d28a4acf816ee5fdd866627c6f23f3fc5f98a98 Parents: 535c3ac 013ce88 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Oct 23 13:59:14 2015 -0400 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Oct 23 13:59:14 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/1d28a4ac/pylib/cqlshlib/test/test_cqlsh_output.py ----------------------------------------------------------------------
