[05/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ad1945e/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java -- diff --cc test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java index e9051b4,000..03d89e1

[05/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

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

[05/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

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

[05/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

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

[05/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

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

[05/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

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

[05/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

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

[05/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

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

[05/10] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.11

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

[05/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

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

[05/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

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

[05/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

Merge branch 'cassandra-3.0' into cassandra-3.11 * cassandra-3.0: Reject default_time_to_live option when creating or altering MVs Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a06b469c Tree:

[05/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

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

[05/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

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