Updated Branches: refs/heads/trunk 45e4484cc -> 620831892
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/62083189 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62083189 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62083189 Branch: refs/heads/trunk Commit: 620831892af36a910f6aa6731cbf3431d8661434 Parents: 45e4484 e04e769 Author: Pavel Yaskevich <[email protected]> Authored: Tue Feb 7 18:17:22 2012 +0300 Committer: Pavel Yaskevich <[email protected]> Committed: Tue Feb 7 18:17:22 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 20 +++++++++++++++ .../cassandra/db/compaction/CompactionManager.java | 19 +++++--------- .../apache/cassandra/db/index/SecondaryIndex.java | 8 +++++- .../cassandra/db/index/SecondaryIndexManager.java | 16 +++++++++++- .../apache/cassandra/db/index/keys/KeysIndex.java | 5 +++ 6 files changed, 56 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/62083189/CHANGES.txt ----------------------------------------------------------------------
