You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by vi...@apache.org on 2012/02/14 19:52:14 UTC

[37/50] git commit: Merge branch 'cassandra-1.1' into trunk

Merge branch 'cassandra-1.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/6feb729c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6feb729c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6feb729c

Branch: refs/heads/cassandra-1.0
Commit: 6feb729c87d485d9295f1e75e1365b3933bb4efa
Parents: 819a74d a576408
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Feb 9 15:35:58 2012 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Feb 9 15:35:58 2012 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |    7 ++++---
 .../service/RangeSliceResponseResolver.java        |   10 +++++++---
 .../org/apache/cassandra/service/StorageProxy.java |    3 ++-
 3 files changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------