[07/23] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/503aec74/bin/cqlsh.py -- diff --cc bin/cqlsh.py index 1f63826,000..e242d42 mode 100644,00..100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -1,2588 -1,0 +1,2592 @@@ +#!

[07/23] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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/06bfa06b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/06bfa06b Diff: http://git-wip-us.apache.org/repos/asf