Updated Branches: refs/heads/cassandra-1.2 b960b2b82 -> 354cb093d refs/heads/cassandra-1.2.0 cc166a525 -> ad36c8fd8 refs/heads/trunk 6f5fc0a4b -> cf706f26c
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/cf706f26 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf706f26 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf706f26 Branch: refs/heads/trunk Commit: cf706f26cafe81d602b2cf2fcfd9df5efa41e6c2 Parents: 6f5fc0a 354cb09 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Nov 21 16:45:40 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Nov 21 16:45:40 2012 -0600 ---------------------------------------------------------------------- .../cassandra/io/LazilyCompactedRowTest.java | 6 ++++-- .../cassandra/io/sstable/SSTableReaderTest.java | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
