Merge branch cassandra-3.0 into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/521cc542 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/521cc542 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/521cc542 Branch: refs/heads/trunk Commit: 521cc542583f8c2c8f8800f19178a0c12645f667 Parents: c37dbdb 29b988d Author: Benjamin Lerer <b.le...@gmail.com> Authored: Tue Nov 24 15:11:42 2015 +0100 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Tue Nov 24 15:11:48 2015 +0100 ---------------------------------------------------------------------- bin/cqlsh.py | 57 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 24 deletions(-) ----------------------------------------------------------------------