Merge branch cassandra-3.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/1a694a9f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a694a9f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a694a9f Branch: refs/heads/trunk Commit: 1a694a9fdd2ad7308b1baa660cca03987aff30da Parents: ba14431 521cc54 Author: Benjamin Lerer <b.le...@gmail.com> Authored: Tue Nov 24 15:14:57 2015 +0100 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Tue Nov 24 15:15:05 2015 +0100 ---------------------------------------------------------------------- bin/cqlsh.py | 57 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 24 deletions(-) ----------------------------------------------------------------------
