[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fd5cb43d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fd5cb43d Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1a596a4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1a596a4 Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ee46dfbf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee46dfbf Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/71e83f35 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71e83f35 Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b9f8eb3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b9f8eb3 Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b815c781 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b815c781 Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2a33c3b1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a33c3b1 Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29c653de Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29c653de Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac60e7dd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac60e7dd Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60aeef3d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60aeef3d Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3e531527 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e531527 Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/924fb4d5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/924fb4d5 Diff:

[2/2] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.1

Merge branch cassandra-3.0 into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e3113c94 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e3113c94 Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/af089f6f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af089f6f Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8feb66e6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8feb66e6 Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c37dbdbe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c37dbdbe Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/383eb46b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/383eb46b Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f3fcdd7c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3fcdd7c Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/58875152 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58875152 Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7a48a7db Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a48a7db Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/51a87113 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51a87113 Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/36e76771 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36e76771 Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b3231e96 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b3231e96 Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ffe48ec6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ffe48ec6 Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6f7b3898 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f7b3898 Diff: