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/bf7caaa2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf7caaa2
Diff:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/43e9d293/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index 85605ae,000..dd0446a
mode 100644,00..100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1,2579 -1,0 +1,2580 @@@
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6e5cdae/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
--
diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
index
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/36394542
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36394542
Diff:
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/80e6879b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/80e6879b
Diff: