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/c738e564 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c738e564 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c738e564 Branch: refs/heads/cassandra-1.1 Commit: c738e564f07371062a73e76093decf0e0592bbb7 Parents: d19182a 82a75d4 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Feb 14 12:01:38 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Feb 14 12:01:38 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/AbstractThreadUnsafeSortedColumns.java | 2 +- .../apache/cassandra/db/AtomicSortedColumns.java | 4 ++-- .../org/apache/cassandra/db/ColumnFamilyStore.java | 4 ++-- .../org/apache/cassandra/db/ISortedColumns.java | 8 ++++++-- 5 files changed, 12 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
