merge from 1.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa408603 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa408603 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa408603 Branch: refs/heads/trunk Commit: aa408603d9685b9e14f0fbc598da808da182ce3f Parents: d4eaf3c 6423bfe Author: Pavel Yaskevich <xe...@apache.org> Authored: Fri Mar 16 14:01:03 2012 +0300 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Fri Mar 16 14:01:03 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 1 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 25 ++++++++++++--- 3 files changed, 22 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa408603/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa408603/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
