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/6dd2413f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6dd2413f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6dd2413f Branch: refs/heads/trunk Commit: 6dd2413f89d06e72f530f71abd3b3d1e2ac1c6e2 Parents: 2e3727e 464ca14 Author: blerer <[email protected]> Authored: Fri Sep 4 21:37:21 2015 +0200 Committer: blerer <[email protected]> Committed: Fri Sep 4 21:37:41 2015 +0200 ---------------------------------------------------------------------- bin/cqlsh.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
