[13/14] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5

2016-03-11 Thread jake
Merge branch 'cassandra-3.0' into cassandra-3.5 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2257a7a7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2257a7a7 Diff: http://git-wip-us.apache.org/repos/asf

[13/14] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5

2016-03-02 Thread marcuse
Merge branch 'cassandra-3.0' into cassandra-3.5 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/87992c3a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87992c3a Diff: http://git-wip-us.apache.org/repos/asf