[12/13] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

2015-12-04 Thread jmckenzie
Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/744daf04 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/744daf04 Diff:

[12/13] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

2015-12-01 Thread jmckenzie
Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6bda8868 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bda8868 Diff: