Updated Branches: refs/heads/trunk 5080f7a25 -> 07f39e8ec
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/07f39e8e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/07f39e8e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/07f39e8e Branch: refs/heads/trunk Commit: 07f39e8ec4b52074bc8f607f6429d53315438082 Parents: 5080f7a 6c2ded6 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Feb 6 17:06:15 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Feb 6 17:06:15 2012 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/db/ColumnFamilyStore.java | 25 ++++++++++++- src/java/org/apache/cassandra/db/Directories.java | 13 ++++++- .../cassandra/io/sstable/SSTableReaderTest.java | 29 +++++++-------- 3 files changed, 49 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
