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

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

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

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