Updated Branches: refs/heads/cassandra-1.0 22b8a9725 -> c3dc78941 refs/heads/trunk 819a74d8a -> 6feb729c8
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/trunk Commit: 6feb729c87d485d9295f1e75e1365b3933bb4efa Parents: 819a74d a576408 Author: Jonathan Ellis <[email protected]> Authored: Thu Feb 9 15:35:58 2012 -0600 Committer: Jonathan Ellis <[email protected]> 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(-) ----------------------------------------------------------------------
