cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Date Wed, 09 Oct 2013 20:26:39 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/228e67e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/228e67e5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/228e67e5

Branch: refs/heads/trunk
Commit: 228e67e59127ad3c1a5087ae0bedbcce0d200ced
Parents: facb81d 6fae7a6
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed Oct 9 15:26:24 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed Oct 9 15:26:24 2013 -0500

----------------------------------------------------------------------
 .../org/apache/cassandra/db/CounterColumn.java    |  2 +-
 .../apache/cassandra/net/MessagingService.java    |  2 +-
 .../apache/cassandra/service/StorageProxy.java    | 18 ++++++++----------
 3 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/228e67e5/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/228e67e5/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------


Mime
View raw message