Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/354cb093 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/354cb093 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/354cb093 Branch: refs/heads/trunk Commit: 354cb093d279d4fdbc69648d75b5651d3646e729 Parents: b960b2b ad36c8f Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Nov 21 16:45:33 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Nov 21 16:45:33 2012 -0600 ---------------------------------------------------------------------- .../cassandra/io/LazilyCompactedRowTest.java | 6 ++++-- .../cassandra/io/sstable/SSTableReaderTest.java | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
