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/464ca14a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/464ca14a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/464ca14a Branch: refs/heads/trunk Commit: 464ca14aa8694766b4e31f5c8c712f34edd9fda7 Parents: 25373e9 acdbdc2 Author: blerer <benjamin.le...@datastax.com> Authored: Fri Sep 4 21:34:37 2015 +0200 Committer: blerer <benjamin.le...@datastax.com> Committed: Fri Sep 4 21:35:19 2015 +0200 ---------------------------------------------------------------------- bin/cqlsh.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
