You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by vi...@apache.org on 2012/02/14 19:52:14 UTC
[33/50] git commit: Merge branch 'cassandra-1.1' into trunk
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/cassandra-1.0
Commit: 59673232dfb90deae30c5a4162b44239e613f656
Parents: 7bc09f9 12d26f8
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Feb 9 17:18:25 2012 -0600
Committer: Jonathan Ellis <jb...@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(-)
----------------------------------------------------------------------