cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [17/17] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Date Tue, 28 Jun 2016 13:22:07 GMT
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
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad5b30ef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad5b30ef

Branch: refs/heads/trunk
Commit: ad5b30effa9b3585db8670dcb3a92b3a716e367e
Parents: 9ff299e 53f8f09
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Jun 28 15:21:21 2016 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Jun 28 15:21:21 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt                                       |  1 +
 .../org/apache/cassandra/cql3/QueryProcessor.java | 17 ++++++++++++++++-
 .../cql3/statements/SelectStatement.java          |  6 +++++-
 .../org/apache/cassandra/db/SystemKeyspace.java   | 12 ++++++------
 .../apache/cassandra/service/StorageProxy.java    |  4 +++-
 .../cassandra/service/paxos/PaxosState.java       | 11 +++++++++--
 .../cassandra/service/paxos/PrepareCallback.java  | 18 +++++++++++++++++-
 src/java/org/apache/cassandra/utils/UUIDGen.java  | 12 ++++++++++++
 8 files changed, 69 insertions(+), 12 deletions(-)
----------------------------------------------------------------------



Mime
View raw message