Updated Branches: refs/heads/trunk fb833b320 -> 62ff2942a
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/62ff2942 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62ff2942 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62ff2942 Branch: refs/heads/trunk Commit: 62ff2942a2263aad485acdc135a64526a1d23d09 Parents: fb833b3 ad98021 Author: Sylvain Lebresne <[email protected]> Authored: Wed Mar 6 18:25:57 2013 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Mar 6 18:25:57 2013 +0100 ---------------------------------------------------------------------- .../apache/cassandra/db/SliceFromReadCommand.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/62ff2942/src/java/org/apache/cassandra/db/SliceFromReadCommand.java ----------------------------------------------------------------------
