Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/01e02192 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/01e02192 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/01e02192 Branch: refs/heads/trunk Commit: 01e02192e7f2c14f4e6030e26d11940dcd0d6da6 Parents: fcd0aeb bab28e4 Author: Sylvain Lebresne <[email protected]> Authored: Mon Sep 16 08:45:30 2013 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Sep 16 08:45:30 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 +- .../org/apache/cassandra/config/CFMetaData.java | 1 + .../org/apache/cassandra/db/SystemKeyspace.java | 38 +++++++-------- .../apache/cassandra/service/StorageProxy.java | 18 ++++--- .../cassandra/service/paxos/PaxosState.java | 35 +++++++------- .../service/paxos/PrepareCallback.java | 7 ++- .../service/paxos/PrepareResponse.java | 6 +++ .../service/paxos/ProposeCallback.java | 49 +++++++++++++++++--- 8 files changed, 102 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/01e02192/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/01e02192/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/01e02192/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
