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/71c94feb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71c94feb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71c94feb Branch: refs/heads/trunk Commit: 71c94feb0173d611ff45a7866e837c242491cbbc Parents: e546e33 50c9d77 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Sep 13 12:07:37 2013 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Sep 13 12:07:37 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/service/StorageProxy.java | 4 ++-- .../service/paxos/PrepareCallback.java | 20 ++++++++++++++++---- 3 files changed, 19 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/71c94feb/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/71c94feb/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
