[6/6] 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/16d1c811 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/16d1c811 Diff:

[6/6] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.5

2016-03-04 Thread blerer
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/8c83c8ed Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8c83c8ed Diff: