cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [5/5] git commit: Merge branch 'cassandra-2.0' into trunk
Date Mon, 09 Sep 2013 22:11:32 GMT
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/241f7a45
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/241f7a45
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/241f7a45

Branch: refs/heads/trunk
Commit: 241f7a4559f4846d0ea31a3c968dfdd75cea8195
Parents: 3b8690d 04cd81c
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Mon Sep 9 23:11:21 2013 +0100
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Mon Sep 9 23:11:21 2013 +0100

----------------------------------------------------------------------
 .../org/apache/cassandra/service/StorageProxy.java  | 13 +++++++++++--
 .../apache/cassandra/service/paxos/PaxosState.java  | 16 +++++++++-------
 2 files changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------



Mime
View raw message