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/a6ae07f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6ae07f1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6ae07f1 Branch: refs/heads/trunk Commit: a6ae07f1687dea674523ed901c271fb926acb51b Parents: 0c0891a a3234e1 Author: Tyler Hobbs <ty...@datastax.com> Authored: Thu Jan 15 11:57:35 2015 -0600 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Thu Jan 15 11:57:35 2015 -0600 ---------------------------------------------------------------------- pylib/cqlshlib/test/test_cqlsh_output.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
