[11/12] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-10-06 Thread slebresne
Merge branch 'cassandra-3.0' into cassandra-3.11 * cassandra-3.0: Ninja-fix changelog Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d09901b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d09901b

[11/12] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-08-29 Thread jasobrown
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/35dc3b65 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/35dc3b65 Diff: