[7/9] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5

2016-04-01 Thread jasobrown
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/18f8c2fe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/18f8c2fe Diff: http://git-wip-us.apache.org/repos/asf

[7/9] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5

2016-03-19 Thread slebresne
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/ef86d919 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef86d919 Diff: http://git-wip-us.apache.org/repos/asf