[08/19] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

2017-10-05 Thread mshuler
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:

[08/19] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

2016-06-01 Thread stefania
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 @@@

[08/19] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

2016-01-12 Thread carl
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

[08/19] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

2015-11-13 Thread jmckenzie
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:

[08/19] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

2015-10-12 Thread benedict
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: