Updated Branches: refs/heads/trunk b096d0bf4 -> 7d5490b58
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/7d5490b5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d5490b5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d5490b5 Branch: refs/heads/trunk Commit: 7d5490b585fd018119a8a4085ca2a572424165f4 Parents: b096d0b 88b9d95 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Feb 26 11:02:46 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Feb 26 11:02:46 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 5 +---- .../apache/cassandra/db/SliceFromReadCommand.java | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d5490b5/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d5490b5/src/java/org/apache/cassandra/db/SliceFromReadCommand.java ----------------------------------------------------------------------
