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

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

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

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

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

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

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

Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: src/java/org/apache/cassandra/transport/Client.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63e122c2 Tree: http://git-wip-us.apache.org/repos/

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

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

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

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

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

Merge branch 'cassandra-2.1' into cassandra-2.2 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/2c9b82d1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2c9b82d1 Diff: http:/

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

Merge branch 'cassandra-2.1' into cassandra-2.2 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/1fbdba2c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1fbdba2c Diff: http:/

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

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

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

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

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

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

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

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

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

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

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

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