Updated Branches: refs/heads/cassandra-1.1 e5be9520b -> 12d26f869 refs/heads/trunk 7bc09f927 -> 59673232d
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/59673232 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/59673232 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/59673232 Branch: refs/heads/trunk Commit: 59673232dfb90deae30c5a4162b44239e613f656 Parents: 7bc09f9 12d26f8 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Feb 9 17:18:25 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Feb 9 17:18:25 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 34 +++++++++++++-- src/java/org/apache/cassandra/db/Table.java | 5 ++ .../apache/cassandra/db/filter/QueryFilter.java | 2 +- .../apache/cassandra/db/index/SecondaryIndex.java | 10 ++++ .../cassandra/db/index/SecondaryIndexManager.java | 24 ++++++++++- .../apache/cassandra/service/StorageService.java | 5 ++ .../cassandra/service/StorageServiceMBean.java | 6 ++- src/java/org/apache/cassandra/tools/NodeCmd.java | 11 +++++ src/java/org/apache/cassandra/tools/NodeProbe.java | 5 ++ 10 files changed, 96 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
