Merge branch 'cassandra-1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68268954 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68268954 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68268954 Branch: refs/heads/cassandra-1.1 Commit: 68268954ac7ebe825cf61f28c8ccbd95dd0fed75 Parents: 87b786f 8413d83 Author: Sylvain Lebresne <[email protected]> Authored: Wed Feb 22 14:23:06 2012 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Feb 22 14:23:06 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/RetriedSliceFromReadCommand.java | 2 +- .../apache/cassandra/db/SliceFromReadCommand.java | 25 ++++++++++---- 3 files changed, 20 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/68268954/CHANGES.txt ----------------------------------------------------------------------
