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/1142183f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1142183f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1142183f Branch: refs/heads/trunk Commit: 1142183f5674b08be441d85eb55588dd8d720e66 Parents: 056055f f319f0a Author: Benjamin Lerer <b.le...@gmail.com> Authored: Tue Nov 24 14:58:57 2015 +0100 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Tue Nov 24 15:00:34 2015 +0100 ---------------------------------------------------------------------- bin/cqlsh.py | 55 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
