Updated Branches: refs/heads/trunk 180f32bf2 -> 4c63c8656
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4c63c865 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c63c865 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4c63c865 Branch: refs/heads/trunk Commit: 4c63c8656bc076f013e8e8a0707efad3409790ac Parents: 180f32b 783e5d4 Author: Pavel Yaskevich <[email protected]> Authored: Tue May 15 20:13:34 2012 +0300 Committer: Pavel Yaskevich <[email protected]> Committed: Tue May 15 20:13:34 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c63c865/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c63c865/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
