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/40cef770 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40cef770 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40cef770 Branch: refs/heads/cassandra-2.2 Commit: 40cef770d08a899860358f31571cba26f5d8d3ee Parents: b06c637 78810f2 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Tue Oct 27 09:11:57 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Tue Oct 27 09:11:57 2015 -0500 ---------------------------------------------------------------------- bin/cqlsh.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
