cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [7/7] git commit: Merge branch 'cassandra-2.1' into trunk
Date Wed, 19 Mar 2014 06:03:31 GMT
Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f10de186
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f10de186
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f10de186

Branch: refs/heads/trunk
Commit: f10de186326b78471efd454bb9d7fa44be515319
Parents: 3acba5b 05541eb
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed Mar 19 01:03:09 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed Mar 19 01:03:09 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                         |  1 +
 .../org/apache/cassandra/service/StorageProxy.java  | 16 ++++++++--------
 .../service/paxos/AbstractPaxosCallback.java        |  6 ++++--
 .../cassandra/service/paxos/PrepareCallback.java    |  5 +++--
 .../cassandra/service/paxos/ProposeCallback.java    |  5 +++--
 5 files changed, 19 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f10de186/CHANGES.txt
----------------------------------------------------------------------


Mime
View raw message