[17/17] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

2016-06-30 Thread jmckenzie
Merge branch 'cassandra-3.9' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d3f76da Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d3f76da Diff: http://git-wip-us.apache.org/repos/asf/cassand

[17/17] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

2016-06-28 Thread slebresne
Merge branch 'cassandra-3.9' into trunk * cassandra-3.9: Avoid stalling Paxos when the paxos state expires Avoid stalling Paxos when the paxos state expires Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad5b30ef