[4/8] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-10-10 Thread mshuler
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e047b1d0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e047b1d0 Diff:

[4/8] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-09-25 Thread paulo
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e3d56ec/test/unit/org/apache/cassandra/cql3/GcCompactionTest.java -- diff --cc test/unit/org/apache/cassandra/cql3/GcCompactionTest.java index a31b9a1,000..84a20de mode

[4/8] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-09-05 Thread paulo
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/85028978 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85028978 Diff:

[4/8] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-08-08 Thread adelapena
http://git-wip-us.apache.org/repos/asf/cassandra/blob/47a2839b/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java -- diff --cc test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java index a6ce08b,000..e9051b4

[4/8] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.11

2017-06-01 Thread blerer
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c9db9af/src/java/org/apache/cassandra/db/rows/UnfilteredRowIteratorWithLowerBound.java -- diff --cc

[4/8] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-04-04 Thread jake
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/449400be Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/449400be Diff:

[4/8] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2016-12-05 Thread carl
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a85b0071 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a85b0071 Diff: