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/a6239778 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6239778 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6239778 Branch: refs/heads/trunk Commit: a62397782c31a686c2a148e3f6ee75e1d58cf6d4 Parents: d7e0c30 941d13d Author: Jason Brown <jasedbr...@gmail.com> Authored: Wed Feb 24 05:52:10 2016 -0800 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Wed Feb 24 05:52:53 2016 -0800 ---------------------------------------------------------------------- bin/cqlsh | 11 +++++++++-- bin/cqlsh.py | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6239778/bin/cqlsh.py ----------------------------------------------------------------------
