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

2017-09-25 Thread ifesdjeen
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4734ce7d/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java -- diff --cc src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java inde

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

2017-09-24 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 100

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

2017-08-29 Thread jasobrown
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/031d76c9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/031d76c9 Diff: http://git-wip-us.apache.org/repos/as

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

2017-08-24 Thread blerer
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/8d98a992 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d98a992 Diff: http://git-wip-us.apache.org/repos/asf/

[6/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 mo

[6/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 src/java/org/apache/cassandra/db/rows/UnfilteredRowIteratorWithLowerBound.j